diff --git a/NuGet.config b/NuGet.config index 7723bf088..e0e0db215 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,33 @@ - - + + + - + + + + + + + + + @@ -47,16 +56,23 @@ - - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04a71d8ff..f8cab39ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,18 +198,18 @@ - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 - + https://github.com/dotnet/arcade - 2e0fab0209c66d181d93b0d03bc267db5bde75be + 099bbb071e187ba4e1603004597624e6acae6394 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 28736b4b4..cb68e967c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23122.4 + 7.0.0-beta.23164.3 @@ -122,8 +122,8 @@ We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. --> - true - true + true + true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) diff --git a/global.json b/global.json index 9890ccd94..da60f35de 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.103", + "dotnet": "7.0.104", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3" } }