From 96ddcd4b9889ee7104409a18ec86c38a6c7b59e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 11:00:17 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/sdk build 20231213.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.2 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad0dcfd39..c54d883c1 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 + d4f622e1e5f5680d416fc913f1427b8b894cc464 - + https://github.com/dotnet/sdk - 6ad1cd1de740d3332af31bd57afef0070b7a3329 + d4f622e1e5f5680d416fc913f1427b8b894cc464 - + https://github.com/dotnet/sdk - 6ad1cd1de740d3332af31bd57afef0070b7a3329 + d4f622e1e5f5680d416fc913f1427b8b894cc464 - + https://github.com/dotnet/sdk - 6ad1cd1de740d3332af31bd57afef0070b7a3329 + d4f622e1e5f5680d416fc913f1427b8b894cc464 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b5ee7e341..375f053ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.2 + 9.0.100-alpha.1.23613.2 + 9.0.100-alpha.1.23613.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b79375ac59baa1bbb1c741b9136743554a75d719 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 13:23:55 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/arcade build 20231212.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23611.2 -> To Version 9.0.0-beta.23612.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad0dcfd39..4c941b03a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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 diff --git a/eng/Versions.props b/eng/Versions.props index b5ee7e341..d1277035a 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 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" } } From 4dff7c253fd15d6aca1ad7311187813f00b58414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 15:56:31 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/sdk build 20231213.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.3 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c54d883c1..fa6aae769 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/sdk - d4f622e1e5f5680d416fc913f1427b8b894cc464 + 7b6a4643d27fb2808923ef6e6558d43223cfb064 - + https://github.com/dotnet/sdk - d4f622e1e5f5680d416fc913f1427b8b894cc464 + 7b6a4643d27fb2808923ef6e6558d43223cfb064 - + https://github.com/dotnet/sdk - d4f622e1e5f5680d416fc913f1427b8b894cc464 + 7b6a4643d27fb2808923ef6e6558d43223cfb064 - + https://github.com/dotnet/sdk - d4f622e1e5f5680d416fc913f1427b8b894cc464 + 7b6a4643d27fb2808923ef6e6558d43223cfb064 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 375f053ba..8bc09f494 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23613.2 - 9.0.100-alpha.1.23613.2 - 9.0.100-alpha.1.23613.2 + 9.0.100-alpha.1.23613.3 + 9.0.100-alpha.1.23613.3 + 9.0.100-alpha.1.23613.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From becf66781342a5281ec755017b3f0300eb7335fa Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Wed, 13 Dec 2023 08:55:53 -0800 Subject: [PATCH 4/8] Remove global CheckEolTargetFramework=false (#17958) --- src/SourceBuild/content/repo-projects/Directory.Build.props | 3 --- 1 file changed, 3 deletions(-) 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 @@ - - - From 27d05d31eb3bb307a36d466704601a284e160280 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 13 Dec 2023 09:12:31 -0800 Subject: [PATCH 5/8] Remove DotNetCoreSdkDir (#17963) --- src/SourceBuild/content/repo-projects/msbuild.proj | 1 - 1 file changed, 1 deletion(-) 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) From 8c98d582e33d2673110df7c091bae57397907335 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 22:15:50 +0000 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/sdk build 20231213.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.5 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa6aae769..b1d8b5e71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/sdk - 7b6a4643d27fb2808923ef6e6558d43223cfb064 + cfce8c40ab83503565f0930be7b90064211d5c70 - + https://github.com/dotnet/sdk - 7b6a4643d27fb2808923ef6e6558d43223cfb064 + cfce8c40ab83503565f0930be7b90064211d5c70 - + https://github.com/dotnet/sdk - 7b6a4643d27fb2808923ef6e6558d43223cfb064 + cfce8c40ab83503565f0930be7b90064211d5c70 - + https://github.com/dotnet/sdk - 7b6a4643d27fb2808923ef6e6558d43223cfb064 + cfce8c40ab83503565f0930be7b90064211d5c70 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 8bc09f494..ef9d86f96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23613.3 - 9.0.100-alpha.1.23613.3 - 9.0.100-alpha.1.23613.3 + 9.0.100-alpha.1.23613.5 + 9.0.100-alpha.1.23613.5 + 9.0.100-alpha.1.23613.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3f671bb680b3fcf43c84c32cc792b0180b79619f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 23:17:41 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/sdk build 20231213.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 9.0.100-alpha.1.23613.1 -> To Version 9.0.100-alpha.1.23613.6 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 9.0.0-alpha.1.23612.4 -> To Version 9.0.0-alpha.1.23612.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1d8b5e71..7961685f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -81,22 +81,22 @@ https://github.com/dotnet/aspnetcore 15194b0a34157cdaf7c0e6e0813929aff2356986 - + https://github.com/dotnet/sdk - cfce8c40ab83503565f0930be7b90064211d5c70 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - cfce8c40ab83503565f0930be7b90064211d5c70 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - cfce8c40ab83503565f0930be7b90064211d5c70 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 - + https://github.com/dotnet/sdk - cfce8c40ab83503565f0930be7b90064211d5c70 + bc9da06d9512a3db932bf638cab8f8e3f5b5aea9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ef9d86f96..6528be3a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,9 +86,9 @@ - 9.0.100-alpha.1.23613.5 - 9.0.100-alpha.1.23613.5 - 9.0.100-alpha.1.23613.5 + 9.0.100-alpha.1.23613.6 + 9.0.100-alpha.1.23613.6 + 9.0.100-alpha.1.23613.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c56fb02646de176ae5546f983e0d597f29eaf2cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 00:09:54 +0000 Subject: [PATCH 8/8] [main] Update dependencies from dotnet/scenario-tests (#17968) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad0dcfd39..d9e29f184 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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..0d8913908 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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