diff --git a/eng/Versions.props b/eng/Versions.props index a0371ba7d24b..57ff6cb8af64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,7 +78,7 @@ - 9.1.0-preview.1.24555.3 + 9.4.0 2.1.0 @@ -87,10 +87,11 @@ 8.0.0 2.0.0-preview.1.24427.4 4.5.1 - 8.0.0 + 9.0.0 4.5.5 - 8.0.0 - 8.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.5 4.5.4 8.0.0 @@ -114,8 +115,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.11.4 - 17.13 + 17.14.8 + 17.14 diff --git a/src/Layout/redist/minimumMSBuildVersion b/src/Layout/redist/minimumMSBuildVersion index 5cc477aa8a0c..89b1c2e0c923 100644 --- a/src/Layout/redist/minimumMSBuildVersion +++ b/src/Layout/redist/minimumMSBuildVersion @@ -1 +1 @@ -17.13.0 +17.14.0 diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 592fea73c335..21933f40a1e8 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -71,7 +71,7 @@ - + @@ -104,19 +104,25 @@ + - - + + - - - + + + - + diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index 1d3be9039972..679d8487c769 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -49,6 +49,7 @@ + diff --git a/test/Microsoft.NET.TestFramework/ToolsetInfo.cs b/test/Microsoft.NET.TestFramework/ToolsetInfo.cs index db10ef95ab60..d68ebe03e1ee 100644 --- a/test/Microsoft.NET.TestFramework/ToolsetInfo.cs +++ b/test/Microsoft.NET.TestFramework/ToolsetInfo.cs @@ -163,7 +163,7 @@ public void AddTestEnvironmentVariables(IDictionary environment) // Use stage 2 MSBuild SDK resolver if (SdkResolverPath is not null) { - environment["MSBUILDADDITIONALSDKRESOLVERSFOLDER"] = SdkResolverPath; + environment["MSBUILDADDITIONALSDKRESOLVERSFOLDER_NETFRAMEWORK"] = SdkResolverPath; } // Avoid using stage 0 dotnet install dir diff --git a/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/TestProject/TestProject.csproj b/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/TestProject/TestProject.csproj index 26d19ec54b4f..ff9709d80d68 100644 --- a/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/TestProject/TestProject.csproj +++ b/test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/TestProject/TestProject.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/UnitTests.proj b/test/UnitTests.proj index a72d18940a57..6c396845af1d 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -138,7 +138,7 @@ . $HELIX_CORRELATION_PAYLOAD/t/RunTestsOnHelix.sh;$(HelixPreCommands) PowerShell -ExecutionPolicy ByPass "dotnet nuget locals all -l | ForEach-Object { $_.Split(' ')[1]} | Where-Object{$_ -like '*cache'} | Get-ChildItem -Recurse -File -Filter '*.dat' | Measure";$(HelixPostCommands) PowerShell -ExecutionPolicy ByPass "Get-ChildItem -Recurse -File -Filter '*hangdump.dmp' | Copy-Item -Destination $env:HELIX_WORKITEM_UPLOAD_ROOT";$(HelixPostCommands) - find "$HELIX_WORKITEM_UPLOAD_ROOT/../../.." -name '*hangdump.dmp' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \%3B;$(HelixPostCommands) + find "$HELIX_WORKITEM_UPLOAD_ROOT/../../.." -name '*hangdump.dmp' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \;;$(HelixPostCommands) $(Version) $(RepoRoot)artifacts\bin\Microsoft.DotNet.MSBuildSdkResolver $(RepoRoot)artifacts\tmp\HelixStage0.tar.gz