RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/Microsoft/msbuild/commit/48f3571f403682272be417671fdcadcb08955b8c below:

Update ToolsVersion to Current · dotnet/msbuild@48f3571 · GitHub

File tree Expand file treeCollapse file tree 28 files changed

+104

-92

lines changed

Filter options

Expand file treeCollapse file tree 28 files changed

+104

-92

lines changed Original file line number Diff line number Diff line change


 @@ -34,7 +34,7 @@

34 34


 <PackageIconUrl>https://go.microsoft.com/fwlink/?linkid=825694</PackageIconUrl>

35 35


 <PackageTags>MSBuild</PackageTags>

36 36 37

-
 <TargetMSBuildToolsVersion>15.0</TargetMSBuildToolsVersion>

37

+
 <TargetMSBuildToolsVersion>Current</TargetMSBuildToolsVersion>

38 38


 </PropertyGroup>

39 39 40 40


 <PropertyGroup>

Original file line number Diff line number Diff line change


 @@ -275,12 +275,12 @@ function Build {

275 275 276 276


 if ($hostType -eq 'full')

277 277

278

-
 $msbuildToUse = Join-Path $bootstrapRoot "net46\MSBuild\15.0\Bin\MSBuild.exe"

278

+
 $msbuildToUse = Join-Path $bootstrapRoot "net46\MSBuild\Current\Bin\MSBuild.exe"

279 279 280 280


 if ($configuration -eq "Debug-MONO" -or $configuration -eq "Release-MONO")

281 281

282 282


 # Copy MSBuild.dll to MSBuild.exe so we can run it without a host

283

-
 $sourceDll = Join-Path $bootstrapRoot "net46\MSBuild\15.0\Bin\MSBuild.dll"

283

+
 $sourceDll = Join-Path $bootstrapRoot "net46\MSBuild\Current\Bin\MSBuild.dll"

284 284


 Copy-Item -Path $sourceDll -Destination $msbuildToUse

285 285

286 286

Original file line number Diff line number Diff line change


 @@ -43,4 +43,4 @@ Please see [Contributing Code](https://github.com/Microsoft/msbuild/blob/master/

43 43 44 44


 To build projects using the MSBuild binaries from the repository, you first need to do a build (command: `build.cmd`) which produces a bootstrap directory mimicing a Visual Studio installation.

45 45 46

-
 Now, just point `artifacts\Debug\bootstrap\net472\MSBuild\15.0\Bin\MSBuild.exe` at a project file.

46

+
 Now, just point `artifacts\Debug\bootstrap\net472\MSBuild\Current\Bin\MSBuild.exe` at a project file.

Original file line number Diff line number Diff line change


 @@ -993,7 +993,7 @@ private MockLogger GetLoggedEventsWithWarningsAsErrorsOrMessages(

993 993


 targetId: -1,

994 994


 taskId: -1);

995 995 996

-
 BuildRequestData buildRequestData = new BuildRequestData("projectFile", new Dictionary<string, string>(), "15.0", new[] { "Build" }, null);

996

+
 BuildRequestData buildRequestData = new BuildRequestData("projectFile", new Dictionary<string, string>(), "Current", new[] { "Build" }, null);

997 997 998 998


 ConfigCache configCache = host.GetComponent(BuildComponentType.ConfigCache) as ConfigCache;

999 999 Original file line number Diff line number Diff line change


 @@ -224,7 +224,7 @@ public void BuildEnvironmentDetectsVisualStudioByEnvironment()

224 224


 using (var env = new EmptyVSEnviroment())

225 225

226 226


 env.WithEnvironment("VSINSTALLDIR", env.TempFolderRoot);

227

-
 env.WithEnvironment("VisualStudioVersion", "15.0");

227

+
 env.WithEnvironment("VisualStudioVersion", MSBuildConstants.CurrentVisualStudioVersion);

228 228


 BuildEnvironmentHelper.ResetInstance_ForUnitTestsOnly(ReturnNull, ReturnNull, ReturnNull, env.VsInstanceMock, env.EnvironmentMock, () => false);

229 229 230 230


 BuildEnvironmentHelper.Instance.VisualStudioInstallRootDirectory.ShouldBe(env.TempFolderRoot);


 @@ -265,8 +265,8 @@ public void BuildEnvironmentDetectsVisualStudioByMSBuildProcessAmd64()

265 265


 [Theory]

266 266


 [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp, "No Visual Studio install for netcore")]

267 267


 [PlatformSpecific(TestPlatforms.Windows)]

268

-
 [InlineData("15.0")]

269

-
 [InlineData("15.3")]

268

+
 [InlineData("16.0")]

269

+
 [InlineData("16.3")]

270 270


 public void BuildEnvironmentDetectsVisualStudioFromSetupInstance(string visualStudioVersion)

271 271

272 272


 using (var env = new EmptyVSEnviroment())


 @@ -473,7 +473,7 @@ public EmptyVSEnviroment() : base("MSBuild.exe", false)

473 473

try

474 474

475 475


 var files = new[] { "msbuild.exe", "msbuild.exe.config" };

476

-
 BuildDirectory = Path.Combine(TempFolderRoot, "MSBuild", "15.0", "Bin");

476

+
 BuildDirectory = Path.Combine(TempFolderRoot, "MSBuild", MSBuildConstants.CurrentToolsVersion, "Bin");

477 477


 BuildDirectory64 = Path.Combine(BuildDirectory, "amd64");

478 478


 DevEnvPath = Path.Combine(TempFolderRoot, "Common7", "IDE", "devenv.exe");

479 479


 BlendPath = Path.Combine(TempFolderRoot, "Common7", "IDE", "blend.exe");

Original file line number Diff line number Diff line change


 @@ -67,7 +67,7 @@ public void RoundtripProjectStartedEventArgs()

67 67


 items: new List<DictionaryEntry>() { new DictionaryEntry("Key", new MyTaskItem() { ItemSpec = "TestItemSpec" }) },

68 68


 parentBuildEventContext: new BuildEventContext(7, 8, 9, 10, 11, 12),

69 69


 globalProperties: new Dictionary<string, string>() { { "GlobalKey", "GlobalValue" } },

70

-
 toolsVersion: "15.0");

70

+
 toolsVersion: "Current");

71 71


 args.BuildEventContext = new BuildEventContext(1, 2, 3, 4, 5, 6);

72 72 73 73


 Roundtrip(args,

Original file line number Diff line number Diff line change


 @@ -548,7 +548,7 @@ public void GetOverrideTasksPathFromRegistry_NonStringData()

548 548


 [Fact]

549 549


 public void GetDefaultOverrideToolsVersionFromRegistry_Basic()

550 550

551

-
 _currentVersionRegistryKey.SetValue("DefaultOverrideToolsVersion", "15.0");

551

+
 _currentVersionRegistryKey.SetValue("DefaultOverrideToolsVersion", "Current");

552 552 553 553


 ToolsetReader reader = GetStandardRegistryReader();

554 554


 Dictionary<string, Toolset> values = new Dictionary<string, Toolset>(StringComparer.OrdinalIgnoreCase);


 @@ -557,7 +557,7 @@ public void GetDefaultOverrideToolsVersionFromRegistry_Basic()

557 557


 string defaultOverrideToolsVersion = null;

558 558


 string defaultToolsVersion = reader.ReadToolsets(values, new PropertyDictionary<ProjectPropertyInstance>(), new PropertyDictionary<ProjectPropertyInstance>(), false, out msbuildOverrideTasksPath, out defaultOverrideToolsVersion);

559 559 560

-
 Assert.Equal("15.0", defaultOverrideToolsVersion);

560

+
 Assert.Equal("Current", defaultOverrideToolsVersion);

561 561

562 562 563 563


 /// <summary>

Original file line number Diff line number Diff line change


 @@ -614,7 +614,7 @@ public void AnyCPULibraryProjectIs32BitPreferredIfPrefer32BitSet()

614 614 615 615


 Project project = ObjectModelHelpers.CreateInMemoryProject(

616 616

@"

617

-
  <Project DefaultTargets=`Build` ToolsVersion=`15.0` xmlns=`msbuildnamespace`>

617

+
  <Project DefaultTargets=`Build` ToolsVersion=`Current` xmlns=`msbuildnamespace`>

618 618


  <PropertyGroup>

619 619


  <OutputPath>" + outputPath + @"</OutputPath>

620 620


  <AssemblyName>MyAssembly</AssemblyName>

Original file line number Diff line number Diff line change


 @@ -26,15 +26,15 @@ protected override string DefaultOverrideToolsVersion

26 26

27 27

get

28 28

29

-
 return MSBuildConstants.CurrentProductVersion;

29

+
 return MSBuildConstants.CurrentToolsVersion;

30 30

31 31

32 32 33 33


 protected override string DefaultToolsVersion

34 34

35 35

get

36 36

37

-
 return MSBuildConstants.CurrentProductVersion;

37

+
 return MSBuildConstants.CurrentToolsVersion;

38 38

39 39

40 40


 @@ -50,7 +50,7 @@ protected override IEnumerable<ToolsetPropertyDefinition> ToolsVersions

50 50

51 51

get

52 52

53

-
 yield return new ToolsetPropertyDefinition(MSBuildConstants.CurrentProductVersion, string.Empty, _sourceLocation);

53

+
 yield return new ToolsetPropertyDefinition(MSBuildConstants.CurrentToolsVersion, string.Empty, _sourceLocation);

54 54

55 55

56 56 Original file line number Diff line number Diff line change


 @@ -1,6 +1,6 @@

1 1


 [$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{0B54AF09-CDE4-40FD-9850-FFFED6E13680}]

2 2


 "name"="Microsoft.Build"

3

-
 "codeBase"="$BaseInstallDir$\MSBuild\15.0\Bin\Microsoft.Build.dll"

3

+
 "codeBase"="$BaseInstallDir$\MSBuild\Current\Bin\Microsoft.Build.dll"

4 4


 "publicKeyToken"="b03f5f7f11d50a3a"

5 5


 "culture"="neutral"

6 6


 "oldVersion"="0.0.0.0-99.9.9.9"

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4