diff --git a/Directory.Build.props b/Directory.Build.props index c373c9beb..15c9d27b7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -24,7 +24,7 @@ true true - net6.0 + net7.0 @@ -48,34 +48,34 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 95569138572484e9e9d1292b890d83e3c121107c + 9e795c014b0be513c84f96427c544bae486bb101 - + https://github.com/dotnet/aspnetcore - 57501251222b199597b9ac16888f362a69eb13c1 + 0e5df998b53ca9f366244ce2cf91ee8a1e4077ba - + https://github.com/dotnet/aspnetcore - 57501251222b199597b9ac16888f362a69eb13c1 + 0e5df998b53ca9f366244ce2cf91ee8a1e4077ba - + https://github.com/dotnet/aspnetcore - 57501251222b199597b9ac16888f362a69eb13c1 + 0e5df998b53ca9f366244ce2cf91ee8a1e4077ba - + https://github.com/dotnet/aspnetcore - 57501251222b199597b9ac16888f362a69eb13c1 + 0e5df998b53ca9f366244ce2cf91ee8a1e4077ba - + https://github.com/dotnet/aspnetcore - 57501251222b199597b9ac16888f362a69eb13c1 + 0e5df998b53ca9f366244ce2cf91ee8a1e4077ba - + https://github.com/dotnet/aspnetcore - 57501251222b199597b9ac16888f362a69eb13c1 + 0e5df998b53ca9f366244ce2cf91ee8a1e4077ba https://github.com/dotnet/test-templates @@ -90,66 +90,66 @@ 5575256de27da7c1f4b035e894fb4b2460cae07b - + https://github.com/dotnet/templating - 3ce436f4675aef2bdfe95903583533fe39be2d99 + 3749bf4a0acd877210c006cdede87482c3279533 - + https://github.com/dotnet/templating - 3ce436f4675aef2bdfe95903583533fe39be2d99 + 3749bf4a0acd877210c006cdede87482c3279533 - + https://github.com/dotnet/sdk - 646ff96f4af13c0ccd248c433c9cf6a7135e701e + 957ae5ca599fdeaee425d23928d42da711373a5e - + https://github.com/dotnet/sdk - 646ff96f4af13c0ccd248c433c9cf6a7135e701e + 957ae5ca599fdeaee425d23928d42da711373a5e - + https://github.com/dotnet/winforms - 08b8359d86475f6c5caf2e13b66fb9706e225acf + e1d1259388761b010658a715eab3fe7ab85c3c5a - + https://github.com/dotnet/wpf - 73d862cf204ec0fa89cc12933cb9f0e6d4e23c1c + 1cd70287044079a23de95a01f686773dfd945eb5 - + https://github.com/dotnet/fsharp - 470cfa0155392abb4727a32f0906c9b3d418e33d + 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/dotnet/fsharp - 470cfa0155392abb4727a32f0906c9b3d418e33d + 6d626ff0752a77d339f609b4d361787dc9ca93a5 - + https://github.com/microsoft/vstest - d6f64b37c2cfee76c8b1269d688384ced30ecd21 + c45cf0b3ed2e4edb47a16afd1255661b4cf5e4ca - + https://github.com/dotnet/linker - 640878adf1e27cb79bea0a894033f85a84db208d + 7cfb14ecdf63b3a6819a89d5c05c2dd84232b246 linker - + https://github.com/dotnet/roslyn - 6e8bb6f10f79579866458d30abcb764d7da9df85 + 5b791f87f5a902491625f28e36ae66986c631f50 - + https://github.com/dotnet/msbuild - 5805e34696afed9398bc05e2c88e9a9d4f79a4ce + 808b2ae2a176679d15f8c3299e551a63cb55b799 - + https://github.com/nuget/nuget.client - e685bdb6d7b4d1f3664f6542f50b84376a19341c + 078701b97eeef2283c1f4605032b5bcf55a80653 @@ -165,9 +165,9 @@ https://github.com/dotnet/emsdk 9f2345b3c5f43dbf34790e21657ae1f2445cd06a - + https://github.com/dotnet/source-build - 521935ddd14437c9fd63eababa674a511e280ee9 + 10d0f7e94aa45889155c312f51cfc01bf326b853 diff --git a/eng/Versions.props b/eng/Versions.props index 5067469e4..f0e6e651e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,15 +24,15 @@ - 6.0.0-rc.2.21459.12 + 7.0.0-alpha.1.21525.3 - 7.0.0-alpha.1.21460.1 + 7.0.0-alpha.1.21525.2 - 7.0.100-alpha.1.21463.5 + 7.0.100-alpha.1.21522.4 @@ -45,44 +45,44 @@ - 7.0.0-alpha.1.21470.28 - 7.0.0-alpha.1.21470.28 - 7.0.0-alpha.1.21470.28 - 7.0.0-alpha.1.21470.28 - 7.0.0-alpha.1.21470.28 - 7.0.0-alpha.1.21470.28 + 7.0.0-alpha.1.21514.17 + 7.0.0-alpha.1.21514.17 + 7.0.0-alpha.1.21514.17 + 7.0.0-alpha.1.21514.17 + 7.0.0-alpha.1.21514.17 + 7.0.0-alpha.1.21514.17 0.2.0 - 7.0.100-alpha.1.21480.10 - 7.0.100-alpha.1.21480.10 + 7.0.100-alpha.1.21525.7 + 7.0.100-alpha.1.21525.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-alpha.1.21480.1 + 7.0.0-alpha.1.21524.4 - 7.0.0-alpha.1.21480.1 - 7.0.0-alpha.1.21480.1 - 7.0.0-alpha.1.21480.1 - 7.0.0-alpha.1.21480.1 - 7.0.0-alpha.1.21480.1 - 7.0.0-alpha.1.21480.1 + 7.0.0-alpha.1.21524.4 + 7.0.0-alpha.1.21524.4 + 7.0.0-alpha.1.21524.4 + 7.0.0-alpha.1.21524.4 + 7.0.0-alpha.1.21524.4 + 7.0.0-alpha.1.21524.4 2.1.0 - 7.0.0-alpha.1.21474.1 - 7.0.0-alpha.1.21474.1 - 7.0.0-alpha.1.21474.1 - 7.0.0-alpha.1.21474.1 + 7.0.0-alpha.1.21525.2 + 7.0.0-alpha.1.21525.2 + 7.0.0-alpha.1.21525.2 + 7.0.0-alpha.1.21525.2 @@ -153,7 +153,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.0.0-release-20210908-02 + 17.1.0-preview-20211012-05 diff --git a/global.json b/global.json index 436662d59..2910d2fc8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-alpha.1.21457.7", + "dotnet": "7.0.100-alpha.1.21518.14", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 7260807b9..90df9ccb2 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -220,14 +220,14 @@ $(ToolRunPrefix)unset DOTNET_INSTALLDIR && - $(MicrosoftNETSdkPackageVersion) - dotnet tool install --local $(ToolCommandName) + $(RedistLayoutPath)dotnet tool install --local $(ToolCommandName) $(InstallToolCommand) --version $(SdkTestPackageVersion) @@ -265,7 +265,7 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" -