diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad0dcfd39..09ccdc1f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,51 +52,51 @@ https://github.com/dotnet/runtime ab1a8224cdf115b65e0db5dc88d11f205068f444 - + https://github.com/dotnet/aspnetcore - 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d + 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/aspnetcore - 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d + 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/aspnetcore - 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d + 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/aspnetcore - 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d + 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/aspnetcore - 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d + 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/aspnetcore - 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d + 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/aspnetcore - 459a4884bf3ccd1f50ada2244a6c2da6a939ae0d + 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/sdk - 6ad1cd1de740d3332af31bd57afef0070b7a3329 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - 6ad1cd1de740d3332af31bd57afef0070b7a3329 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - 6ad1cd1de740d3332af31bd57afef0070b7a3329 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - 6ad1cd1de740d3332af31bd57afef0070b7a3329 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 https://github.com/dotnet/test-templates @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 0a0217fe0cdd3654105d1c46be4e43eeae9c163e + 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d https://github.com/dotnet/runtime @@ -245,9 +245,9 @@ 229464299759d6667e8b907d9c321d31a8dcc123 - + https://github.com/dotnet/scenario-tests - 8af694a5e3986a27ccfee1a638ba311c7e9bc55d + 0589a90cb11bb1daf9c05f20c1dc2d78c49075f2 diff --git a/eng/Versions.props b/eng/Versions.props index b5ee7e341..b3a71de8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23611.2 + 9.0.0-beta.23612.2 @@ -73,22 +73,22 @@ - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 - 9.0.0-alpha.1.23612.4 + 9.0.0-alpha.1.23612.5 + 9.0.0-alpha.1.23612.5 + 9.0.0-alpha.1.23612.5 + 9.0.0-alpha.1.23612.5 + 9.0.0-alpha.1.23612.5 + 9.0.0-alpha.1.23612.5 + 9.0.0-alpha.1.23612.5 0.2.0 - 9.0.100-alpha.1.23613.1 - 9.0.100-alpha.1.23613.1 - 9.0.100-alpha.1.23613.1 + 9.0.100-alpha.1.23613.6 + 9.0.100-alpha.1.23613.6 + 9.0.100-alpha.1.23613.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -248,7 +248,7 @@ 2.0.0 17.9.0-preview-23610-02 8.0.0-alpha.1.22557.12 - 8.0.0-preview.23424.2 + 9.0.0-preview.23613.1 diff --git a/global.json b/global.json index 4787071d4..5ad922d74 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23611.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23611.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23612.2" } } diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 266ebe7ce..d4d3f3aeb 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -119,9 +119,6 @@ - - - diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj index ac9e32455..36c6ab7c0 100644 --- a/src/SourceBuild/content/repo-projects/msbuild.proj +++ b/src/SourceBuild/content/repo-projects/msbuild.proj @@ -10,7 +10,6 @@ $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(BuildCommandArgs) $(OutputVersionArgs) - $(BuildCommandArgs) /p:DotNetCoreSdkDir=$(DotNetCliToolDir) $(StandardSourceBuildCommand) $(BuildCommandArgs)