From fc3950b1773294fa01b2d95743699652648c6fe1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 7 Feb 2024 03:16:02 +0000 Subject: [PATCH 01/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240206.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.407 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3a1c275a..6acb2b9e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,26 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 610156f32..64a394776 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c116bc27e66738427df5f153c2514c606a85b3a + fc1baf7747d439f5f7dd0aebd6acba6950e3edbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c116bc27e66738427df5f153c2514c606a85b3a + fc1baf7747d439f5f7dd0aebd6acba6950e3edbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c116bc27e66738427df5f153c2514c606a85b3a + fc1baf7747d439f5f7dd0aebd6acba6950e3edbc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c116bc27e66738427df5f153c2514c606a85b3a + fc1baf7747d439f5f7dd0aebd6acba6950e3edbc diff --git a/eng/Versions.props b/eng/Versions.props index 5d53ab6bc..a808d29f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.406 - 7.0.406-servicing.24069.9 - 7.0.406-servicing.24069.9 + 7.0.407 + 7.0.407-servicing.24106.26 + 7.0.407-servicing.24106.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9c496e94dedbc4d7949381ec4fc5b2fb7e9628ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 20:05:23 +0000 Subject: [PATCH 02/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.407 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 32 +++++---------- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++---------- 3 files changed, 75 insertions(+), 89 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6acb2b9e7..dce8eea5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,27 +10,19 @@ - - - + - - - + - - - + - + - - - + @@ -52,21 +44,15 @@ - - - + - - - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64a394776..6d92e6b42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + ffc51078b47f8e5175a83f25c6288491511ce3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + ffc51078b47f8e5175a83f25c6288491511ce3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + ffc51078b47f8e5175a83f25c6288491511ce3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f58ad2d644bb52baf49e85be027bf2db3fced446 + ffc51078b47f8e5175a83f25c6288491511ce3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567edafe6106e6b769c64f6a2ed876190baa642a + 2aef67c5b99de279b9acbcddd89310515b4f8eff @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 610fe433e07b32ed451ed99d07df63be47c29050 + 1fe4cc0a785efc50422ea03d8b762a856fee4298 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc1baf7747d439f5f7dd0aebd6acba6950e3edbc + 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc1baf7747d439f5f7dd0aebd6acba6950e3edbc + 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc1baf7747d439f5f7dd0aebd6acba6950e3edbc + 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fc1baf7747d439f5f7dd0aebd6acba6950e3edbc + 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d - + https://github.com/dotnet/emsdk - ca510604d1667f32b4fa4653e3d3b64be8136bdc + ec6dc98ec8a69a8eed65d46fda484669a963626d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index a808d29f8..9b83c3748 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,13 +56,13 @@ - 7.0.16 - 7.0.16 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 - 7.0.16-servicing.24068.15 + 7.0.17 + 7.0.17 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 + 7.0.17-servicing.24113.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24106.26 - 7.0.407-servicing.24106.26 + 7.0.407-servicing.24115.21 + 7.0.407-servicing.24115.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.16-servicing.24066.29 - 7.0.16-servicing.24066.29 - 7.0.16 - 7.0.16 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24114.21 + 7.0.17-servicing.24114.21 + 7.0.17 + 7.0.17 + 7.0.17 + 7.0.17 2.1.0 - 7.0.16-servicing.24068.4 - 7.0.16-servicing.24068.4 - 7.0.16 - 7.0.16 + 7.0.17-servicing.24114.7 + 7.0.17-servicing.24114.7 + 7.0.17 + 7.0.17 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.16 - 7.0.16 + 7.0.17 + 7.0.17 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 0adc333c9fc3483fe518a08b106c5d3f9d697b60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 06:29:35 +0000 Subject: [PATCH 03/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.71 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.407 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index dce8eea5b..0a99eed77 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d92e6b42..8ad1e3529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 + 59722ba58f5cd744a57921098d8af0a8bb22db0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 + 59722ba58f5cd744a57921098d8af0a8bb22db0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 + 59722ba58f5cd744a57921098d8af0a8bb22db0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0c4daf01caf9b492ee8dfc096fd309aa8638fc72 + 59722ba58f5cd744a57921098d8af0a8bb22db0b diff --git a/eng/Versions.props b/eng/Versions.props index 9b83c3748..19f72966f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24115.21 - 7.0.407-servicing.24115.21 + 7.0.407-servicing.24115.71 + 7.0.407-servicing.24115.71 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 999373878f7efc81bdc2dc589fef5d2b09f459a4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 07:32:39 +0000 Subject: [PATCH 04/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.78 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.406 -> To Version 7.0.407 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,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.16 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0a99eed77..10559228c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ad1e3529..7044a0c02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59722ba58f5cd744a57921098d8af0a8bb22db0b + c7252b613858c58968d7b7ceac1f31342dd98e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59722ba58f5cd744a57921098d8af0a8bb22db0b + c7252b613858c58968d7b7ceac1f31342dd98e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59722ba58f5cd744a57921098d8af0a8bb22db0b + c7252b613858c58968d7b7ceac1f31342dd98e80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59722ba58f5cd744a57921098d8af0a8bb22db0b + c7252b613858c58968d7b7ceac1f31342dd98e80 diff --git a/eng/Versions.props b/eng/Versions.props index 19f72966f..afe6e53c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24115.71 - 7.0.407-servicing.24115.71 + 7.0.407-servicing.24115.78 + 7.0.407-servicing.24115.78 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9536f4f4fcb6f4810fe7d1422d8f5eef9ee63bad Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 19:45:49 +0000 Subject: [PATCH 05/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.407 -> To Version 7.0.407 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.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++-------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 10559228c..2c2530bc7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,19 @@ - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d90e05a1b..f59bdedcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ffc51078b47f8e5175a83f25c6288491511ce3c2 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ffc51078b47f8e5175a83f25c6288491511ce3c2 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ffc51078b47f8e5175a83f25c6288491511ce3c2 + c2fca339644c5d9626c72ceac378cf728dd0d56a https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ffc51078b47f8e5175a83f25c6288491511ce3c2 + c2fca339644c5d9626c72ceac378cf728dd0d56a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aef67c5b99de279b9acbcddd89310515b4f8eff + dff486f2d78d3f932d0f9bfa38043f85e358fb8c @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1fe4cc0a785efc50422ea03d8b762a856fee4298 + 92c510e77b344db7085a4f6a4eb83ca821a78572 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7252b613858c58968d7b7ceac1f31342dd98e80 + ced4d212d02b6892c6e1a28bcb032d222c84bce0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7252b613858c58968d7b7ceac1f31342dd98e80 + ced4d212d02b6892c6e1a28bcb032d222c84bce0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7252b613858c58968d7b7ceac1f31342dd98e80 + ced4d212d02b6892c6e1a28bcb032d222c84bce0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7252b613858c58968d7b7ceac1f31342dd98e80 + ced4d212d02b6892c6e1a28bcb032d222c84bce0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3d504675f930028236a0f09e47c900ad48bd3d6e + fcbb04f265a8923c27ad55eaa51b1913b5db732e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4a6accdbfd70e66399781c75b0c0a179f4b7e7eb + 0b58a4b68b566568e74d51a6999f71108ff71f05 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 47eeb2ee6..47d0bb040 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.16-servicing.24067.11 + 7.0.17-servicing.24115.10 - 7.0.16-servicing.24068.4 + 7.0.17-servicing.24115.3 @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 - 7.0.17-servicing.24113.13 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 + 7.0.17-servicing.24115.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24115.78 - 7.0.407-servicing.24115.78 + 7.0.407-servicing.24116.14 + 7.0.407-servicing.24116.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.17-servicing.24114.21 - 7.0.17-servicing.24114.21 + 7.0.17-servicing.24115.8 + 7.0.17-servicing.24115.8 7.0.17 7.0.17 7.0.17 @@ -96,8 +96,8 @@ - 7.0.17-servicing.24114.7 - 7.0.17-servicing.24114.7 + 7.0.17-servicing.24115.4 + 7.0.17-servicing.24115.4 7.0.17 7.0.17 From 1dc393c598f0fd10db0da9ca1e7789ce179165de Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 22:40:09 +0000 Subject: [PATCH 06/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.49 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.407 -> To Version 7.0.407 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2c2530bc7..f14b05c5a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f59bdedcc..cf95753cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 92c510e77b344db7085a4f6a4eb83ca821a78572 + 96cbc87b920c0937bef069e7561477919ddc520f https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced4d212d02b6892c6e1a28bcb032d222c84bce0 + 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced4d212d02b6892c6e1a28bcb032d222c84bce0 + 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced4d212d02b6892c6e1a28bcb032d222c84bce0 + 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ced4d212d02b6892c6e1a28bcb032d222c84bce0 + 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f diff --git a/eng/Versions.props b/eng/Versions.props index 47d0bb040..b33528d1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 - 7.0.17-servicing.24115.2 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24116.14 - 7.0.407-servicing.24116.14 + 7.0.407-servicing.24116.49 + 7.0.407-servicing.24116.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7892638bf945fa3b54531477c03d57e830f5c9ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:36:12 +0000 Subject: [PATCH 07/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.76 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.407 -> To Version 7.0.407 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index f14b05c5a..3152b2fe6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf95753cc..90563cc5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c2fca339644c5d9626c72ceac378cf728dd0d56a + 8e24710202fffe3656e6d26d6a03e53b3de83484 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f + c33ed262876fcbae195d8e812da8d9002f4a92b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f + c33ed262876fcbae195d8e812da8d9002f4a92b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f + c33ed262876fcbae195d8e812da8d9002f4a92b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e0b6aa9a147ca88fb568d1b2cd82cf579ddd96f + c33ed262876fcbae195d8e812da8d9002f4a92b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fcbb04f265a8923c27ad55eaa51b1913b5db732e + a21b74e7f5e96ccb8d95dcde605669feb30f6c5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0b58a4b68b566568e74d51a6999f71108ff71f05 + 6b9b816bff16a1b507019fe6313b6baecb83b580 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b33528d1c..edf35a2a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.17-servicing.24115.10 + 7.0.17-servicing.24116.2 - 7.0.17-servicing.24115.3 + 7.0.17-servicing.24116.10 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24116.49 - 7.0.407-servicing.24116.49 + 7.0.407-servicing.24116.76 + 7.0.407-servicing.24116.76 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.17-servicing.24115.4 - 7.0.17-servicing.24115.4 + 7.0.17-servicing.24116.11 + 7.0.17-servicing.24116.11 7.0.17 7.0.17 From d795d05759cbd4c7d53011704aecb369f69b2302 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 01:40:44 +0000 Subject: [PATCH 08/11] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.89 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.407 -> To Version 7.0.407 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 7.0.17 -> To Version 7.0.17 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3152b2fe6..b05560e29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90563cc5b..bee510625 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 96cbc87b920c0937bef069e7561477919ddc520f + d0ca5a8d20ac50a33d5451e998a5d411a810c8d7 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c33ed262876fcbae195d8e812da8d9002f4a92b2 + 2b14eab8f8fe3fcf40457dc7def499c3745f1c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c33ed262876fcbae195d8e812da8d9002f4a92b2 + 2b14eab8f8fe3fcf40457dc7def499c3745f1c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c33ed262876fcbae195d8e812da8d9002f4a92b2 + 2b14eab8f8fe3fcf40457dc7def499c3745f1c01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c33ed262876fcbae195d8e812da8d9002f4a92b2 + 2b14eab8f8fe3fcf40457dc7def499c3745f1c01 diff --git a/eng/Versions.props b/eng/Versions.props index edf35a2a4..daf1521c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.17 7.0.17 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 - 7.0.17-servicing.24116.6 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 + 7.0.17-servicing.24116.13 0.2.0 @@ -70,8 +70,8 @@ 7.0.407 - 7.0.407-servicing.24116.76 - 7.0.407-servicing.24116.76 + 7.0.407-servicing.24116.89 + 7.0.407-servicing.24116.89 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8e5bd09ba0a7ed5286a5a7a78518955f81270f7e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 09:51:06 -0700 Subject: [PATCH 09/11] Update the nuget and msbuild ref versions for the installer tasks to the matching version we ship --- eng/Versions.props | 7 ++++++- src/core-sdk-tasks/core-sdk-tasks.csproj | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1c2cf4220..35145bde9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,12 @@ - 5.8.0 + 6.0.6-rc.4 + $(NuGetBuildTasksPackageVersion) + + + + 17.0.1 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index 5ad1f11af..f92da6189 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -9,12 +9,12 @@ - - + + - + From 51480eb1bba3851603e912ccd15e0786a2266250 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Mar 2024 12:55:15 -0700 Subject: [PATCH 10/11] Update to 7.0.4xx versions --- eng/Versions.props | 4 ++-- src/core-sdk-tasks/core-sdk-tasks.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 35145bde9..e97055a2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,12 +111,12 @@ - 6.0.6-rc.4 + 6.7.1-rc.1 $(NuGetBuildTasksPackageVersion) - 17.0.1 + 17.7.4 diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj index f92da6189..d9cdc0381 100644 --- a/src/core-sdk-tasks/core-sdk-tasks.csproj +++ b/src/core-sdk-tasks/core-sdk-tasks.csproj @@ -14,7 +14,7 @@ - + From 5b7dc90e6ba1d092c39959953b4f8471fdf220c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 05:58:34 +0000 Subject: [PATCH 11/11] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.24160.1 -> To Version 7.0.0-beta.24163.12 --- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +++++++++---------- eng/common/post-build/publish-using-darc.ps1 | 4 +-- .../templates/job/publish-build-assets.yml | 8 +++--- eng/common/templates/jobs/jobs.yml | 4 +-- .../templates/post-build/post-build.yml | 12 ++++----- global.json | 6 ++--- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b133817c8..51ffd4c5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b - + https://github.com/dotnet/arcade - aa22ad6cceb0fcb802ed542360827c191024649e + bbc75d8a5897763eaf6945c263759930e02dd32b https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5f92e512a..3213c3f28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.24160.1 + 7.0.0-beta.24163.12 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..f3dc39a12 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } $dotnetVersions = @('5','6','7') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 127948252..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -92,7 +92,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -101,7 +101,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -127,7 +127,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -154,4 +154,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c74..289bb2396 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 37bca799a..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -227,9 +227,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true diff --git a/global.json b/global.json index 58e631be4..f6f1f44a5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.116", + "dotnet": "7.0.117", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24160.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24160.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24163.12", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24163.12" } }