From 860067bade6be3fbda19a3162abde99286c82df1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:00:08 -0500 Subject: [PATCH 1/9] [release/7.0.1xx] Update dependencies from dotnet/sdk (#14692) * Update dependencies from https://github.com/dotnet/sdk build 20221007.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221007.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221007.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22506.24 -> To Version 7.0.100-rtm.22507.19 * Update dependencies from https://github.com/dotnet/sdk build 20221007.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.19 -> To Version 7.0.100-rtm.22507.25 * Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++--------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70ba1d1a1..7c0a9db85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e5f1b07e2b0e290412cca52d87508ce738882eff https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae https://github.com/dotnet/aspnetcore @@ -103,39 +103,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/sdk - 1015b43c834666023cfbd7fd933016dd2ef80745 + f22b2f81c736691aca92af4c425e41b219adc0e1 - + https://github.com/dotnet/winforms - 993983be2ce14ca67f7ff09b8b04e9b8391b3339 + b718d35e98c370ff27249f8f6c57325033a27c7e - + https://github.com/dotnet/wpf - a956caa0747c27f0b0776d845fafe0b05b2c7337 + 8091341440149a2ff67ed5af6efbb43c349ee537 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 532a074f9b304325d8bcd554ac73a1183b74a8f0 - + https://github.com/dotnet/fsharp - f07ccb1bc4325861cb4306733f59b23f6d4344f7 + 532a074f9b304325d8bcd554ac73a1183b74a8f0 @@ -154,9 +154,9 @@ 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb - + https://github.com/dotnet/msbuild - 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef + 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + daca2015ce74956591df9c9dc7ee732af7863b42 - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + daca2015ce74956591df9c9dc7ee732af7863b42 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 14ef392eb..47c98cda6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22476.8 + 7.0.0-rtm.22506.1 - 7.0.0-rtm.22476.6 + 7.0.0-rtm.22506.9 @@ -63,33 +63,33 @@ - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 - 7.0.100-rtm.22506.24 + 7.0.100-rtm.22507.25 + 7.0.100-rtm.22507.25 + 7.0.100-rtm.22507.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22507.1 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 + 7.0.0-rtm.22507.1 2.1.0 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 - 7.0.0-rtm.22478.5 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 + 7.0.0-rtm.22507.2 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22476.2 - 7.0.0-rtm.22476.2 + 7.0.0-rtm.22504.3 + 7.0.0-rtm.22504.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 24a021275381d7ad78581c1c76173345bbc11778 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Wed, 5 Oct 2022 16:29:15 +0000 Subject: [PATCH 2/9] Condition sourcelink generation --- .../content/ArcadeOverrides/SourceBuildArcadeBuild.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets index eeea55fcc..6ee80ed90 100644 --- a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets +++ b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets @@ -86,9 +86,9 @@ $(InnerBuildArgs) /p:SourceBuiltBlobFeedDir=$(SourceBuiltBlobFeedDir) - $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false - $(InnerBuildArgs) /p:EnableSourceLink=false - $(InnerBuildArgs) /p:DeterministicSourcePaths=false + $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false + $(InnerBuildArgs) /p:EnableSourceLink=false + $(InnerBuildArgs) /p:DeterministicSourcePaths=false $(InnerBuildArgs) /p:DotNetBuildOffline=true $(InnerBuildArgs) /p:DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath) From 837b3a13610161b0e446c235d6e5c05e4a516b54 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Fri, 7 Oct 2022 16:25:20 +0000 Subject: [PATCH 3/9] Remove redundant arguments - these properties are set by repos based on value of DisableSourceLink property --- .../content/ArcadeOverrides/SourceBuildArcadeBuild.targets | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets index 6ee80ed90..94d7777c3 100644 --- a/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets +++ b/src/SourceBuild/tarball/content/ArcadeOverrides/SourceBuildArcadeBuild.targets @@ -85,10 +85,6 @@ $(InnerBuildArgs) /p:SourceBuildOutputDir=$(SourceBuildOutputDir) $(InnerBuildArgs) /p:SourceBuiltBlobFeedDir=$(SourceBuiltBlobFeedDir) - - $(InnerBuildArgs) /p:EnableSourceControlManagerQueries=false - $(InnerBuildArgs) /p:EnableSourceLink=false - $(InnerBuildArgs) /p:DeterministicSourcePaths=false $(InnerBuildArgs) /p:DotNetBuildOffline=true $(InnerBuildArgs) /p:DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath) From dc021278a8054118b027aa766215fe6dfb18e550 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Oct 2022 11:20:50 -0500 Subject: [PATCH 4/9] Remove questionable license cleanup logic (#14681) --- .../Arcade/tools/SourceBuildArcadeTarball.targets | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 1a652650a..e7a9698c6 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -262,19 +262,8 @@ $(TarballSourceDir)runtime*\src\installer\pkg\**\*%(TarballSrcBinaryExtension.Identity)" /> + - - - - - - - - - - From e1d19eb3fa40813d1a6e2e45d4dc00b08cd835e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 18:13:26 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/sdk build 20221010.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c0a9db85..035010d46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 - + https://github.com/dotnet/sdk - f22b2f81c736691aca92af4c425e41b219adc0e1 + 39b57e7c15ec09a0c230dade5f014d17be960b42 @@ -149,9 +149,9 @@ linker - + https://github.com/dotnet/roslyn - 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb + 7971633700e06fdd0a46dbae78908582ee533c2a diff --git a/eng/Versions.props b/eng/Versions.props index 47c98cda6..481f4a2e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22507.25 - 7.0.100-rtm.22507.25 - 7.0.100-rtm.22507.25 + 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18a6bff6a69ffebcdd18c171747ca1be30b6ef95 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Oct 2022 13:46:25 -0500 Subject: [PATCH 6/9] Fix source-build CI to not run tarball build when tarball creation fails (#14678) * Fix source-build CI to not run tarball build when tarball creation failed * Bad fix * Revert test patch --- .../templates/job/source-build-run-tarball-build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index dd39d4e2d..60b39b652 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -1,9 +1,6 @@ # Builds a source-build tarball parameters: - # Custom condition to apply to the job - condition: true - # Dependent jobs that must be completed before this job will run dependsOn: @@ -30,7 +27,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: x64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: excludeSdkContentTests: true @@ -78,7 +74,6 @@ jobs: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: architecture: arm64 - condition: ${{ parameters.condition }} dependsOn: ${{ parameters.dependsOn }} ${{ if in(variables['Build.Reason'], 'PullRequest') }}: excludeSdkContentTests: true @@ -100,7 +95,7 @@ jobs: architecture: x64 # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status. # The bootstrap build will shortcut if the stage 1 build failed. - condition: and(${{ parameters.condition }}, succeededOrFailed()) + condition: succeededOrFailed() dependsOn: Build_Tarball_x64 excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} From 5449eb59d38ec8e370b1db25aeff4ee007170ad3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 21:01:47 +0000 Subject: [PATCH 7/9] Update dependencies from https://github.com/dotnet/sdk build 20221010.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (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 035010d46..4f9afc01b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 - + https://github.com/dotnet/sdk - 39b57e7c15ec09a0c230dade5f014d17be960b42 + f9280d1aafb6735d0f2df431b4e05de365d0c793 diff --git a/eng/Versions.props b/eng/Versions.props index 481f4a2e5..71814b15e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22510.8 - 7.0.100-rtm.22510.8 - 7.0.100-rtm.22510.8 + 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ffedce380ba93630a621475c2ed735ac8e4c155f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 23:29:44 +0000 Subject: [PATCH 8/9] Update dependencies from https://github.com/dotnet/sdk build 20221010.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.16 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (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 4f9afc01b..4ebae28fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,22 +103,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 - + https://github.com/dotnet/sdk - f9280d1aafb6735d0f2df431b4e05de365d0c793 + 047029f55d17036beb6461c894174127a8252810 diff --git a/eng/Versions.props b/eng/Versions.props index 71814b15e..6b908a727 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.100-rtm.22510.10 - 7.0.100-rtm.22510.10 - 7.0.100-rtm.22510.10 + 7.0.100-rtm.22510.16 + 7.0.100-rtm.22510.16 + 7.0.100-rtm.22510.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26501197562333dacac457c8ae6d3ae430888cb0 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 10 Oct 2022 22:57:01 -0700 Subject: [PATCH 9/9] Revert changes to eng/folder from branch merge --- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++-------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db22b2f35..6bfdd18a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,51 +1,51 @@ - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 - + https://github.com/dotnet/windowsdesktop - e5f1b07e2b0e290412cca52d87508ce738882eff + ae2bcebe032a50af14ac0b05efcaa8477b049834 https://github.com/dotnet/llvm-project 78c9eaec7cec210dfaee9a0443d5816b59683697 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df @@ -53,9 +53,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + 5147f6fc78520db322118cc8287651cb54a506df https://github.com/dotnet/aspnetcore @@ -103,39 +103,39 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/sdk - 047029f55d17036beb6461c894174127a8252810 + 1015b43c834666023cfbd7fd933016dd2ef80745 - + https://github.com/dotnet/winforms - b718d35e98c370ff27249f8f6c57325033a27c7e + 993983be2ce14ca67f7ff09b8b04e9b8391b3339 - + https://github.com/dotnet/wpf - 8091341440149a2ff67ed5af6efbb43c349ee537 + a956caa0747c27f0b0776d845fafe0b05b2c7337 - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + f07ccb1bc4325861cb4306733f59b23f6d4344f7 - + https://github.com/dotnet/fsharp - 532a074f9b304325d8bcd554ac73a1183b74a8f0 + f07ccb1bc4325861cb4306733f59b23f6d4344f7 @@ -149,14 +149,14 @@ linker - + https://github.com/dotnet/roslyn - 7971633700e06fdd0a46dbae78908582ee533c2a + 6a0bbe19399f7da58f006b25c282c1cd5c5a96eb - + https://github.com/dotnet/msbuild - 9e6f1455a81e01cb7780f1e8ed5041f20cd396a3 + 20ce296d6b3f4e63a511321c7e1a2f69a4ee63ef @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 77c2667993976295017e2759f075550bcf606fc1 - + https://github.com/dotnet/emsdk - daca2015ce74956591df9c9dc7ee732af7863b42 + 77c2667993976295017e2759f075550bcf606fc1 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 50bf2ac7b..3fcf24983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,11 +31,11 @@ - 7.0.0-rtm.22506.1 + 7.0.0-rtm.22476.8 - 7.0.0-rtm.22506.9 + 7.0.0-rtm.22476.6 @@ -63,33 +63,33 @@ - 7.0.100-rtm.22510.16 - 7.0.100-rtm.22510.16 - 7.0.100-rtm.22510.16 + 7.0.100-rtm.22506.24 + 7.0.100-rtm.22506.24 + 7.0.100-rtm.22506.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22505.15 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 + 7.0.0-rtm.22505.15 2.1.0 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 - 7.0.0-rtm.22507.2 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 + 7.0.0-rtm.22478.5 @@ -205,8 +205,8 @@ 12.3.1006-rc.1 15.4.1006-rc.1 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.0-rtm.22504.3 - 7.0.0-rtm.22504.3 + 7.0.0-rtm.22476.2 + 7.0.0-rtm.22476.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)