From fe2506d83ca1d17f4999cad948a84e929407a703 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 3 Oct 2022 14:07:33 -0700 Subject: [PATCH 1/8] Switch to 7.0.2xx for loc build still needs internal loc change request --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index d84e640811ed..82d308331ecd 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -15,13 +15,13 @@ parameters: timeoutInMinutes: 180 jobs: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.1xx'), not(contains(parameters.agentOs, 'TemplateEngine'))) }}: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.2xx'), not(contains(parameters.agentOs, 'TemplateEngine'))) }}: - template: /eng/common/templates/job/onelocbuild.yml parameters: CreatePr: true LclSource: lclFilesfromPackage LclPackageId: 'LCL-JUNO-PROD-DOTNETSDK' - MirrorBranch: release/7.0.1xx + MirrorBranch: release/7.0.2xx MirrorRepo: sdk - ${{ if not(contains(parameters.agentOs, 'TemplateEngine')) }}: From b0fdbda0a5c85aa6bb4de756160114a7bb5e881e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Oct 2022 17:14:20 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/msbuild build 20221006.2 Microsoft.Build , Microsoft.Build.Localization From Version 17.4.0-preview-22480-04 -> To Version 17.5.0-preview-22506-02 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 177acab06c77..bdfff2aff012 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://github.com/dotnet/runtime 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/msbuild - e1930c2ee6b16a0c5afbdc53ec51dbdda4664f80 + 541c0a1cabe05c0c9a49eb0469c3b961f881af4e - + https://github.com/dotnet/msbuild - e1930c2ee6b16a0c5afbdc53ec51dbdda4664f80 + 541c0a1cabe05c0c9a49eb0469c3b961f881af4e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4d6eebfa9350..022ee237b73d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.4.0-preview-22480-04 + 17.5.0-preview-22506-02 $(MicrosoftBuildPackageVersion) - 17.5.0-preview-22506-02 + 17.5.0-preview-22506-03 $(MicrosoftBuildPackageVersion) - 12.0.5-beta.22477.2 + 12.0.5-beta.22506.5 From 98e60b6a89b12970f60665f9982afc2860f82519 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 07:14:35 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221006.4 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22506.4 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 7.0.0-rtm.22476.6 -> To Version 7.0.0-rtm.22506.8 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2c70983d09..35965085255b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -143,25 +143,25 @@ https://github.com/dotnet/runtime 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e0a07d3272a18b4f391fb4a4ee8237e9e83a4fa2 - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e0a07d3272a18b4f391fb4a4ee8237e9e83a4fa2 - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e0a07d3272a18b4f391fb4a4ee8237e9e83a4fa2 - + https://github.com/dotnet/windowsdesktop - ae2bcebe032a50af14ac0b05efcaa8477b049834 + e0a07d3272a18b4f391fb4a4ee8237e9e83a4fa2 - + https://github.com/dotnet/wpf - a956caa0747c27f0b0776d845fafe0b05b2c7337 + 10dffc1ec519abcee21eaa420bc15bf7d6b60984 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index cacd5ecde528..d437a940d48b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ - 7.0.0-rtm.22476.6 + 7.0.0-rtm.22506.8 From dfbf786d341fbc3ce723c31471ac43e09dd6bd08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 08:39:38 +0000 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/windowsdesktop build 20221007.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0 From Version 7.0.0-rtm.22478.5 -> To Version 7.0.0-rtm.22507.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 7.0.0-rtm.22476.6 -> To Version 7.0.0-rtm.22506.9 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35965085255b..2cde898c153b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -143,25 +143,25 @@ https://github.com/dotnet/runtime 5147f6fc78520db322118cc8287651cb54a506df - + https://github.com/dotnet/windowsdesktop - e0a07d3272a18b4f391fb4a4ee8237e9e83a4fa2 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - e0a07d3272a18b4f391fb4a4ee8237e9e83a4fa2 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - e0a07d3272a18b4f391fb4a4ee8237e9e83a4fa2 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/windowsdesktop - e0a07d3272a18b4f391fb4a4ee8237e9e83a4fa2 + e5f1b07e2b0e290412cca52d87508ce738882eff - + https://github.com/dotnet/wpf - 10dffc1ec519abcee21eaa420bc15bf7d6b60984 + 8091341440149a2ff67ed5af6efbb43c349ee537 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d437a940d48b..04a2cbabbfbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,7 +168,7 @@ - 7.0.0-rtm.22506.8 + 7.0.0-rtm.22506.9 From da0cd386955285a5fa8af178ad801563f7f7bc1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 10:39:11 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/templating build 20221007.5 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 7.0.100-rtm.22504.5 -> To Version 7.0.100-rtm.22507.5 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2c70983d09..8fa14da891d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 0b4eccde51cf6aadf82cfba0b2a5e4aa4200beea + 90b4ea928260c3265949f957d9be506289d8462f - + https://github.com/dotnet/templating - 0b4eccde51cf6aadf82cfba0b2a5e4aa4200beea + 90b4ea928260c3265949f957d9be506289d8462f diff --git a/eng/Versions.props b/eng/Versions.props index cacd5ecde528..e343bc27e884 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.100-rtm.22504.5 + 7.0.100-rtm.22507.5 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.100-rtm.22504.5 + 7.0.100-rtm.22507.5 $(MicrosoftTemplateEngineAbstractionsPackageVersion) From a4302585399796a0571a2e478ab4345a9b373c53 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Oct 2022 14:50:16 +0000 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/runtime build 20221007.1 Microsoft.DotNet.ILCompiler , Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 , VS.Redist.Common.NetCore.TargetingPack.x64.7.0 From Version 7.0.0-rtm.22505.15 -> To Version 7.0.0-rtm.22507.1 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c2c70983d09..a6ceec31052e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,41 +10,41 @@ 0b4eccde51cf6aadf82cfba0b2a5e4aa4200beea - + 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 - + 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/msbuild @@ -118,30 +118,30 @@ 219e84c88def8276179f66282b2f7cb5f1d0d126 - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae https://github.com/dotnet/linker 219e84c88def8276179f66282b2f7cb5f1d0d126 - + 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/windowsdesktop @@ -288,9 +288,9 @@ https://github.com/dotnet/arcade 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/runtime - 5147f6fc78520db322118cc8287651cb54a506df + b8a4363ecd194d4e7906648a505701a9d2b7aeae https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index cacd5ecde528..bd1c771255b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 6.0.0 7.0.0-beta.22464.4 7.0.0-preview.22423.2 - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22507.1 4.3.0 4.3.0 4.0.5 6.0.0 - 7.0.0-rtm.22505.15 + 7.0.0-rtm.22507.1 4.6.0 2.0.0-beta4.22402.1 1.0.0-preview5.1.22263.1 @@ -49,13 +49,13 @@ - 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 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 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 6.0.0-preview.7.21363.9 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 @@ -91,10 +91,10 @@ - 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