From a31a45c2e76b9ed2921c9a412edba9f83b13f6b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 06:51:47 +0000 Subject: [PATCH 001/118] Update dependencies from https://github.com/dotnet/sdk build 20210217.34 (#9744) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21117.36 to 3.9.0-5.21117.38 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 699153aee..6ae62f44d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 8d7d0a0a03881dbc3a9a55bb72537468279fbd40 + 3df7d03c173a539729f58d759fcf48ee29320291 - + https://github.com/dotnet/sdk - 8d7d0a0a03881dbc3a9a55bb72537468279fbd40 + 3df7d03c173a539729f58d759fcf48ee29320291 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 27b636fe5edc14e8b4199ea5464b8879529615bf + 8d78fb5ec0d751ee8c27b911870b088e9f15501a https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index f15f8914c..1bf535d28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21117.30 - 5.0.200-servicing.21117.30 + 5.0.200-servicing.21117.34 + 5.0.200-servicing.21117.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 131ba21cbe5f186b715e565ce4086497ce5ff133 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 10:21:13 +0000 Subject: [PATCH 002/118] Update dependencies from https://github.com/dotnet/sdk build 20210218.3 (#9748) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.9.0-rc.7121 to 5.9.0-rc.7122 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ae62f44d..5c69c9431 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 3df7d03c173a539729f58d759fcf48ee29320291 + c040f1fcaf1b81959fd07360e629cfbc9ffdfb40 - + https://github.com/dotnet/sdk - 3df7d03c173a539729f58d759fcf48ee29320291 + c040f1fcaf1b81959fd07360e629cfbc9ffdfb40 @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild 57a23d249aafe6409b3e24836a486f769cb74c2c - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 5596ad8221369990f634a3d01f8c334e0ccb2b3d + abf0ba0638070af16427cea69bd47a9945fd5d7a https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index 1bf535d28..ba4cc8c89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21117.34 - 5.0.200-servicing.21117.34 + 5.0.200-servicing.21118.3 + 5.0.200-servicing.21118.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72a15606742bc76e4548451615dd87876ae856e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 03:20:40 +0000 Subject: [PATCH 003/118] Update dependencies from https://github.com/dotnet/sdk build 20210218.32 (#9763) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21117.38 to 3.9.0-5.21118.46 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c69c9431..65fbc1fd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - c040f1fcaf1b81959fd07360e629cfbc9ffdfb40 + 965b1f96df3dfd549a3af9f54203ee36b255afba - + https://github.com/dotnet/sdk - c040f1fcaf1b81959fd07360e629cfbc9ffdfb40 + 965b1f96df3dfd549a3af9f54203ee36b255afba @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 8d78fb5ec0d751ee8c27b911870b088e9f15501a + cf6270bf910a7397947b5f539827b8282b48f252 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index ba4cc8c89..a12f4525b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21118.3 - 5.0.200-servicing.21118.3 + 5.0.200-servicing.21118.32 + 5.0.200-servicing.21118.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 930412ccb0519fbbba953c519b844cef980715eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 20:43:18 +0000 Subject: [PATCH 004/118] Update dependencies from https://github.com/dotnet/sdk build 20210220.4 (#9777) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-5.21118.46 to 3.9.0-5.21120.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65fbc1fd8..24ff4d021 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 965b1f96df3dfd549a3af9f54203ee36b255afba + 01a01aa760490465f7949b27512b191972bf36e2 - + https://github.com/dotnet/sdk - 965b1f96df3dfd549a3af9f54203ee36b255afba + 01a01aa760490465f7949b27512b191972bf36e2 @@ -117,9 +117,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - cf6270bf910a7397947b5f539827b8282b48f252 + accdcb77007e801eabcb2c221bad9ef837b64ee3 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index a12f4525b..c6d274868 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21118.32 - 5.0.200-servicing.21118.32 + 5.0.200-servicing.21120.4 + 5.0.200-servicing.21120.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e22c92fbd0e60d098341b392c263b3b5f7f553a Mon Sep 17 00:00:00 2001 From: William Li Date: Sun, 21 Feb 2021 11:46:15 -0800 Subject: [PATCH 005/118] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c6d274868..00a39d000 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From 887809fbf343392f8728eecd3feef16123560f4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 15:04:13 +0000 Subject: [PATCH 006/118] Update dependencies from https://github.com/dotnet/sdk build 20210223.3 (#9779) [release/5.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 16.9.0-release-20210216-04 to 16.9.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24ff4d021..30f217db7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://github.com/dotnet/sdk - 01a01aa760490465f7949b27512b191972bf36e2 + 1679bd5a2093db54f04f6a3c900ea3c511f1d8cf - + https://github.com/dotnet/sdk - 01a01aa760490465f7949b27512b191972bf36e2 + 1679bd5a2093db54f04f6a3c900ea3c511f1d8cf @@ -108,9 +108,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 27786c21f7f586214b5721d2aa6380e69079b072 + 6a858a323caa439115e9e3cf1c958b04f4ff9993 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 00a39d000..107bfe842 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.200-servicing.21120.4 - 5.0.200-servicing.21120.4 + 5.0.200-servicing.21123.3 + 5.0.200-servicing.21123.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.0-release-20210216-04 + 16.9.1 From b5c628e773880d37c8e01d0ae725ddf8ca52e2c8 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 13:50:18 -0800 Subject: [PATCH 007/118] Update branding to 5.0.201 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 107bfe842..ad65fddb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8db26e114b8b3ee44946aba7b15dc3574f031eb6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 23 Feb 2021 22:57:43 +0000 Subject: [PATCH 008/118] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.200-servicing.21123.3 -> To Version 5.0.201-servicing.21123.16 Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,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 5.0.3-servicing.21073.2 -> To Version 5.0.4-servicing.21117.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 26 ++++++++++++++++ eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++--------- 3 files changed, 73 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed61ab0c8..eee169958 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,21 @@ + + + + + + + + + + + + @@ -22,6 +34,20 @@ + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30f217db7..91435b3dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f8d26ae79a212ae4e64f2fac177a013f4e82307e + e708867037ec6edbe7965b8f0f1193999785037e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f8d26ae79a212ae4e64f2fac177a013f4e82307e + e708867037ec6edbe7965b8f0f1193999785037e https://github.com/dotnet/windowsdesktop @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + f27d33729518f5aa478aa818b7b4f54a4d50bef1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + f27d33729518f5aa478aa818b7b4f54a4d50bef1 @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + e882394a7bb38930da748291fe2c2ceaa6a80588 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + e882394a7bb38930da748291fe2c2ceaa6a80588 - - https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - efc2924e6e36db17611c7da480d5bc97a4514cb8 + + https://github.com/dotnet/efcore + cfd206aa4bc7c878dbbd91959f1c9edada70da93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + e882394a7bb38930da748291fe2c2ceaa6a80588 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d827c653b787c07de908240b7746ce34d3e6271e + e882394a7bb38930da748291fe2c2ceaa6a80588 https://github.com/dotnet/test-templates @@ -87,22 +87,22 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - - https://github.com/dotnet/sdk - 1679bd5a2093db54f04f6a3c900ea3c511f1d8cf + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + eb87e99879e0d4f697c33b6d991af832d4345a06 - - https://github.com/dotnet/sdk - 1679bd5a2093db54f04f6a3c900ea3c511f1d8cf + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + eb87e99879e0d4f697c33b6d991af832d4345a06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - ea25334307fb11be0b03c56ce767f25faf5259c1 + 3991c2606be14a6faf29eeafe824bd4444e85ea1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3a3d1e582344146190e9815e79cd5c8a29361b3d + 5d6364723197e917e11c0d442545287c27754aa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ad65fddb7..f70153bfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.3-servicing.21073.2 + 5.0.4-servicing.21117.2 - 5.0.3-servicing.21073.2 + 5.0.4-servicing.21117.5 @@ -43,20 +43,20 @@ - 5.0.3 + 5.0.4 5.0.0 5.0.0-rtm.20526.5 - 5.0.3-servicing.21073.3 - 5.0.3-servicing.21073.3 - 5.0.3-servicing.21073.3 + 5.0.4-servicing.21118.15 + 5.0.4-servicing.21118.15 + 5.0.4-servicing.21118.15 0.2.0 - 5.0.200-servicing.21123.3 - 5.0.200-servicing.21123.3 + 5.0.201-servicing.21123.16 + 5.0.201-servicing.21123.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,17 +67,17 @@ - 5.0.3-servicing.21072.12 - 5.0.3 - 5.0.3 + 5.0.4-servicing.21116.14 + 5.0.4 + 5.0.4 5.0.0 - 5.0.3 + 5.0.4 2.1.0 - 5.0.3-servicing.21073.2 - 5.0.3 + 5.0.4-servicing.21117.6 + 5.0.4 5.0.0 5.0.0-rtm.20520.1 From 38fc6a86428a396d9a99a56a8a081d264705e453 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 16:27:49 -0800 Subject: [PATCH 009/118] Cherry-pick internal runtime download change --- eng/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/eng/build.yml b/eng/build.yml index 1293e3764..6190e078b 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -43,10 +43,14 @@ phases: - _SignType: test - _BuildArgs: '/p:DotNetSignType=$(_SignType)' - _DOTNETCLIMSRC_READ_SAS_TOKEN: '' + - _InternalRuntimeDownloadArgs: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNet-MSRC-Storage - _DOTNETCLIMSRC_READ_SAS_TOKEN: $(dotnetclimsrc-read-sas-token) + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet + /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - group: DotNet-Symbol-Server-PATs @@ -81,6 +85,7 @@ phases: -Architecture $(_BuildArchitecture) $(_BuildArgs) $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) displayName: Build env: DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE) @@ -107,6 +112,7 @@ phases: $(_RuntimeIdentifier) $(_BuildArgs) $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) displayName: Build env: DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) @@ -119,6 +125,7 @@ phases: --configuration $(_BuildConfig) $(_BuildArgs) $(_AdditionalBuildParameters) + $(_InternalRuntimeDownloadArgs) displayName: Build env: DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN) From 23f416f8ded43697063d01f12e52bc4c9e957eef Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 16:43:00 -0800 Subject: [PATCH 010/118] Cherry-pick internal runtime download change --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index b317beac2..5476160e6 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -334,7 +334,7 @@ From c64c312424d79b201aff8cbbe422dc00f66dbf1a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 16:45:03 -0800 Subject: [PATCH 011/118] Fixup nuget.config --- NuGet.config | 5 ----- 1 file changed, 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index eee169958..0cd46b0c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,8 +22,6 @@ - - @@ -48,8 +46,5 @@ - - - From 95ef7ddfd311bcba133b34ce62789f5d684cc31a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 23 Feb 2021 17:12:42 -0800 Subject: [PATCH 012/118] Use VS redist targeting pack version for blob location --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 8 +++----- src/redist/targets/GenerateLayout.targets | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91435b3dc..52b5521ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,6 +21,10 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 + + https://github.com/dotnet/runtime + cf258a14b70ad9069470a108f13765e0e5988f51 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f27d33729518f5aa478aa818b7b4f54a4d50bef1 diff --git a/eng/Versions.props b/eng/Versions.props index f70153bfc..04cd93aa1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,17 +62,15 @@ $(MicrosoftNETSdkPackageVersion) - - 5.0.1 - - - + 5.0.4-servicing.21116.14 5.0.4 5.0.4 5.0.0 5.0.4 + 5.0.1 2.1.0 + 5.0.0-rtm.20519.4 diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 5476160e6..8e50a8ff7 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -16,7 +16,7 @@ $(MicrosoftWindowsDesktopAppPackageVersion) - 5.0.0-rtm.20563.12 + $(VSRedistCommonNetCoreTargetingPackx6450PackageVersion) $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion) 3.0.0 From d26f0db0825bfe8d94b3d11dda0f0ac489ac0bbf Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 10 Dec 2020 13:51:19 -0800 Subject: [PATCH 013/118] Update implicit versions Disable and fix tests do not work with non-existent LastRuntimeFrameworkVersion --- ...venWeWantToRequireWindowsForDesktopApps.cs | 20 ++++++++++++++- test/SdkTests/TestConfig.xml | 25 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs index f6d55f644..235e8a4cf 100644 --- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs +++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Xml.Linq; using EndToEnd; using FluentAssertions; using Microsoft.DotNet.Tools.Test.Utilities; @@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd testProjectCreator.AdditionalProperties["OutputType"] = "exe"; testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid; - var testInstance = testProjectCreator.Create(); + // At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed + static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project) + { + XNamespace ns = project.Root.Name.Namespace; + var target = XElement.Parse(@" + + 3.1.10 + + + + 3.1.10 + + "); + target.Name = ns + target.Name.LocalName; + project.Root.Add(target); + } + TestFramework.TestAssetInstance testInstance + = testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion); new PublishCommand() .WithWorkingDirectory(testInstance.Root.FullName) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 794dd1478..b652d18ae 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -141,5 +141,30 @@ Skip="true" Issue="" Reason="Need all .NET core runtime"/> + + + + + + + From f0291202761dccd8b09db173be70dba43124f700 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Feb 2021 02:37:12 +0000 Subject: [PATCH 014/118] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.23 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.201-servicing.21123.16 -> To Version 5.0.201-servicing.21123.23 --- 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 52b5521ed..8235613b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb87e99879e0d4f697c33b6d991af832d4345a06 + 51ff67bd457ca07bab44409a3f58b9bb68997f2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb87e99879e0d4f697c33b6d991af832d4345a06 + 51ff67bd457ca07bab44409a3f58b9bb68997f2f diff --git a/eng/Versions.props b/eng/Versions.props index 04cd93aa1..b799ab465 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.201-servicing.21123.16 - 5.0.201-servicing.21123.16 + 5.0.201-servicing.21123.23 + 5.0.201-servicing.21123.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1fec136e53e7d363139415f95e7c84d2368de910 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Feb 2021 02:37:20 +0000 Subject: [PATCH 015/118] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210223.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.201-servicing.21123.23 -> To Version 5.0.201-servicing.21123.24 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8235613b4..a76fbcaee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,11 +91,11 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk 51ff67bd457ca07bab44409a3f58b9bb68997f2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk 51ff67bd457ca07bab44409a3f58b9bb68997f2f diff --git a/eng/Versions.props b/eng/Versions.props index b799ab465..453c5383c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.201-servicing.21123.23 - 5.0.201-servicing.21123.23 + 5.0.201-servicing.21123.24 + 5.0.201-servicing.21123.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 04de76ed9f1faefb4497f61f984d373fbe9caf57 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 24 Feb 2021 02:37:27 +0000 Subject: [PATCH 016/118] Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.Net.Compilers.Toolset From Version 5.0.4-servicing.21117.6 -> To Version 5.0.4-servicing.21117.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a76fbcaee..421995e80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,7 +5,7 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop e708867037ec6edbe7965b8f0f1193999785037e @@ -121,9 +121,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - accdcb77007e801eabcb2c221bad9ef837b64ee3 + 0ffb65777acd74de98f6faef0ade9a14211475c2 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 453c5383c..c069d443e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,7 +74,7 @@ - 5.0.4-servicing.21117.6 + 5.0.4-servicing.21117.9 5.0.4 5.0.0 5.0.0-rtm.20520.1 From cea92349d3002ced48cc768cd35e5fb3472f6092 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 25 Feb 2021 11:30:48 -0800 Subject: [PATCH 017/118] Update branding for 5.0.2xx 5.0.2xx --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 107bfe842..48e2766dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 00 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 05eccf2790c927235a61d65a4ba91dbba643e034 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 27 Feb 2021 02:35:11 +0000 Subject: [PATCH 018/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.9.0-6.21123.28 to 3.9.0-6.21126.12 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 421995e80..cd21d036a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51ff67bd457ca07bab44409a3f58b9bb68997f2f + 65d520e2cf220458a34194a218c26fac75d41b30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51ff67bd457ca07bab44409a3f58b9bb68997f2f + 65d520e2cf220458a34194a218c26fac75d41b30 @@ -121,9 +121,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - 0ffb65777acd74de98f6faef0ade9a14211475c2 + dc0eaac24c61809533ab7b4c6eddf141683c9e12 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index c069d443e..d84aa4442 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.201-servicing.21123.24 - 5.0.201-servicing.21123.24 + 5.0.201-servicing.21126.16 + 5.0.201-servicing.21126.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From beafdfb94215e62ab01f3b1825b7e810ef04f150 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 10 Dec 2020 13:51:19 -0800 Subject: [PATCH 019/118] Update implicit versions Disable and fix tests do not work with non-existent LastRuntimeFrameworkVersion --- ...venWeWantToRequireWindowsForDesktopApps.cs | 20 ++++++++++++++- test/SdkTests/TestConfig.xml | 25 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs index f6d55f644..235e8a4cf 100644 --- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs +++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs @@ -3,6 +3,7 @@ using System; using System.IO; +using System.Xml.Linq; using EndToEnd; using FluentAssertions; using Microsoft.DotNet.Tools.Test.Utilities; @@ -48,7 +49,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd testProjectCreator.AdditionalProperties["OutputType"] = "exe"; testProjectCreator.AdditionalProperties["RuntimeIdentifier"] = Rid; - var testInstance = testProjectCreator.Create(); + // At certain point of the release cycle LatestRuntimeFrameworkVersion in eng folder may not exist on the nuget feed + static void overrideLastRuntimeFrameworkVersionToExistingOlderVersion(XDocument project) + { + XNamespace ns = project.Root.Name.Namespace; + var target = XElement.Parse(@" + + 3.1.10 + + + + 3.1.10 + + "); + target.Name = ns + target.Name.LocalName; + project.Root.Add(target); + } + TestFramework.TestAssetInstance testInstance + = testProjectCreator.Create().WithProjectChanges(overrideLastRuntimeFrameworkVersionToExistingOlderVersion); new PublishCommand() .WithWorkingDirectory(testInstance.Root.FullName) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 794dd1478..b652d18ae 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -141,5 +141,30 @@ Skip="true" Issue="" Reason="Need all .NET core runtime"/> + + + + + + + From 3e424c4d764eb581b21fa128255647a4120b1eb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 07:06:21 +0000 Subject: [PATCH 020/118] Update dependencies from https://github.com/dotnet/arcade build 20210309.2 (#9897) [release/5.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- global.json | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed61ab0c8..7bdc11768 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30f217db7..840cd2ea5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - d8c68c834bcca3f721ad1550404807e301ba7afe + f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 - + https://github.com/dotnet/arcade - d8c68c834bcca3f721ad1550404807e301ba7afe + f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 48e2766dc..fc50e949e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21112.3 + 5.0.0-beta.21159.2 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 650b13b08..a40ee827a 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -54,7 +54,7 @@ try { --id $buildId ` --publishing-infra-version $PublishingInfraVersion ` --default-channels ` - --source-branch master ` + --source-branch main ` --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` diff --git a/global.json b/global.json index 2d311e487..69256da0f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.2" } } From 9e521f7bf1433e51eadd7883a24794a94d4bb060 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Mar 2021 19:09:26 +0000 Subject: [PATCH 021/118] Update dependencies from https://github.com/dotnet/arcade build 20210309.7 (#9910) [release/5.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 840cd2ea5..aaa67b479 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 + 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 - + https://github.com/dotnet/arcade - f185e9dfcae59cf5024d3ce17884f03c8f8f4c70 + 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index fc50e949e..3545ac81f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21159.2 + 5.0.0-beta.21159.7 diff --git a/global.json b/global.json index 69256da0f..5760c69fc 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.2" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7" } } From 3a2f084b9b68c376f4f9b91ed3878c28b8741377 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Wed, 10 Mar 2021 11:47:01 -0800 Subject: [PATCH 022/118] Removing internal feeds --- NuGet.config | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index abe026c55..e66336daa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,21 +6,9 @@ - - - - - - - - - - - - - - + + @@ -31,19 +19,8 @@ - - - - - - - - - - - - - - + + + From 0c8356304d27fd4043512017385a7740f9ce3461 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 11 Mar 2021 09:26:52 -0800 Subject: [PATCH 023/118] Update Aspnetcore 2.1 & 3.1 template versions (#9820) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9d4cae42a..a63e7e202 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ 3.1.10 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.12 + 3.1.13 3.2.1 4.8.0-rc2.19462.10 @@ -121,7 +121,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.25 + 2.1.26 From fadd4e80e37d7a022049965352ee4f128bece388 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 12 Mar 2021 13:12:56 +0000 Subject: [PATCH 024/118] Merged PR 13526: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 5.0.200-preview.21109.7 to 5.0.202-preview.21160.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Test.Sdk**: from 16.9.1 to 16.9.1-release-20210308-01 (parent: Microsoft.NET.Sdk) - **Microsoft.Net.Compilers.Toolset**: from 3.9.0-6.21126.12 to 3.9.0-6.21160.10 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210311.12 - **Date Produced**: 3/11/2021 5:52 PM - **Commit**: 11c6481f7999454c4ae775a5965da43aec349092 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.201-servicing.21126.16 to 5.0.202-servicing.21161.12][1] - **Microsoft.NET.Sdk**: [from 5.0.201-servicing.21126.16 to 5.0.202-servicing.21161.12][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 5.0.200-preview.21109.7 to 5.0.202-preview.21160.5][2] - **Microsoft.NET.Test.Sdk**: [from 16.9.1 to 16.9.1-release-20210308-01][3] - **Microsoft.Net.Compilers.Toolset**: [from 3.9.0-6.21126.12 to 3.9.0-6.21160.10][4] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC65d520e&targetVersion=GC11c6481&_a=files [2]: https://github.com/dotnet/templating/compare/ce1a4cd...b906108 [3]: https://github.com/microsoft/vstest/compare/6a858a3...6a858a3 [4]: https://github.com/dotnet/roslyn/compare/dc0eaac...59eedc3 [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a6d3ee4f..4ad21115e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,17 +87,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - ce1a4cd3340d93e1a3d56d16600bd30f7ee32bda + b906108c90b3e15cfff7bb401a9c536c58284d68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65d520e2cf220458a34194a218c26fac75d41b30 + 11c6481f7999454c4ae775a5965da43aec349092 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65d520e2cf220458a34194a218c26fac75d41b30 + 11c6481f7999454c4ae775a5965da43aec349092 @@ -112,7 +112,7 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest 6a858a323caa439115e9e3cf1c958b04f4ff9993 @@ -121,9 +121,9 @@ 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d linker - + https://github.com/dotnet/roslyn - dc0eaac24c61809533ab7b4c6eddf141683c9e12 + 59eedc33d35754759994155ea2f4e1012a9951e3 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index ea0fc78f0..61fac2df8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.200-preview.21109.7 + 5.0.202-preview.21160.5 @@ -55,8 +55,8 @@ - 5.0.201-servicing.21126.16 - 5.0.201-servicing.21126.16 + 5.0.202-servicing.21161.12 + 5.0.202-servicing.21161.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.1 + 16.9.1-release-20210308-01 From a7de7897f7507d67f3f4c15a731dd41a71e886ea Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Mar 2021 14:48:00 +0000 Subject: [PATCH 025/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.202-preview.21160.5 to 5.0.202 (parent: Microsoft.NET.Sdk) --- NuGet.config | 3 +++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e66336daa..60087d47c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ad21115e..7c20a3e58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,17 +87,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - b906108c90b3e15cfff7bb401a9c536c58284d68 + 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11c6481f7999454c4ae775a5965da43aec349092 + 5478cd132f799303e30ad4aaccec8d15ea4a3146 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11c6481f7999454c4ae775a5965da43aec349092 + 5478cd132f799303e30ad4aaccec8d15ea4a3146 diff --git a/eng/Versions.props b/eng/Versions.props index 61fac2df8..3158458b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.202-preview.21160.5 + 5.0.202 @@ -55,8 +55,8 @@ - 5.0.202-servicing.21161.12 - 5.0.202-servicing.21161.12 + 5.0.202-servicing.21166.2 + 5.0.202-servicing.21166.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 374dc98bd7ed8f1a1ed6a99004d4d3180417e935 Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Wed, 17 Mar 2021 12:45:17 -0700 Subject: [PATCH 026/118] Update ManualVersions.props --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index e89f3da42..7225dae04 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.14 - 10.0.18362.14 - 10.0.19041.14 + 10.0.17763.15 + 10.0.18362.15 + 10.0.19041.15 From 3757bb5e64cfa52224dca0997e1e02280f6e3618 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Mar 2021 04:54:52 +0000 Subject: [PATCH 027/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.Build: from 16.9.0 to 16.9.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 3 +++ eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60087d47c..9bf796464 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c20a3e58..b81bdd659 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5478cd132f799303e30ad4aaccec8d15ea4a3146 + aff722214d21d01c1abce2d168bf9a8bb6473fe6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5478cd132f799303e30ad4aaccec8d15ea4a3146 + aff722214d21d01c1abce2d168bf9a8bb6473fe6 @@ -127,7 +127,7 @@ https://github.com/dotnet/msbuild - 57a23d249aafe6409b3e24836a486f769cb74c2c + 5e4b48a27efce55a613664b58d353ab4c8d1f6c1 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 3158458b8..e11f48c08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21166.2 - 5.0.202-servicing.21166.2 + 5.0.202-servicing.21167.21 + 5.0.202-servicing.21167.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ec1985f6fde09ccc0b3d6d16784fe3e415dcbf51 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Mar 2021 17:02:26 +0000 Subject: [PATCH 028/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.9.0-rc.7122 to 5.9.1-rc.1 (parent: Microsoft.NET.Sdk) - Port dotnet-tools-internal --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/SetupNugetSources.ps1 | 5 +++++ eng/common/SetupNugetSources.sh | 14 ++++++++++++++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9bf796464..0b235c25d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b81bdd659..1f000402d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aff722214d21d01c1abce2d168bf9a8bb6473fe6 + 5742a78782052538603f91507bf5d276f51e7300 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aff722214d21d01c1abce2d168bf9a8bb6473fe6 + 5742a78782052538603f91507bf5d276f51e7300 @@ -129,9 +129,9 @@ https://github.com/dotnet/msbuild 5e4b48a27efce55a613664b58d353ab4c8d1f6c1 - + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - abf0ba0638070af16427cea69bd47a9945fd5d7a + fad4343fa8ba919bb8a1b86bb22310824bf14268 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index e11f48c08..9bc93242d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21167.21 - 5.0.202-servicing.21167.21 + 5.0.202-servicing.21168.6 + 5.0.202-servicing.21168.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a0b5fc37f..a6d188f1f 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -158,4 +158,9 @@ if ($dotnet5Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } +$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") +if ($dotnetToolsSource -ne $null) { + AddPackageSource -Sources $sources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 2734601c1..81d7913e6 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,6 +129,20 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet5-internal-transport') fi +# Ensure dotnet-tools-internal is in the packageSources if the public dotnet-tools feed is present +grep -i "" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + fi + PackageSources+=('dotnet-tools-internal') +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' From f8976a91b24ae9bb06c7eefe6b60b63a141bad83 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Mar 2021 20:36:51 +0000 Subject: [PATCH 029/118] Merged PR 13715: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App**: from 5.0.4-servicing.21117.9 to 5.0.5-servicing.21167.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Internal**: from 5.0.4-servicing.21116.14 to 5.0.5-servicing.21166.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 5.0.1 to 5.0.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.EntityFrameworkCore**: from 5.0.4 to 5.0.5 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - **dotnet-dev-certs**: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 5.0.4-servicing.21118.15 to 5.0.5-servicing.21167.8 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.4-servicing.21117.2 to 5.0.5-servicing.21167.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.4 to 5.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.4-servicing.21117.5 to 5.0.5-servicing.21167.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210318.16 - **Date Produced**: 3/18/2021 5:55 PM - **Commit**: acd467496cf41224b70e0e25aa05bb8cde28c5eb - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.202-servicing.21168.6 to 5.0.202-servicing.21168.16][1] - **Microsoft.NET.Sdk**: [from 5.0.202-servicing.21168.6 to 5.0.202-servicing.21168.16][1] - **Microsoft.WindowsDesktop.App**: [from 5.0.4-servicing.21117.9 to 5.... --- NuGet.config | 23 +++++++++++++++ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 70 insertions(+), 47 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b235c25d..53f355d24 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,11 +6,23 @@ + + + + + + + + + + + + @@ -24,6 +36,17 @@ + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f000402d..1878833cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e708867037ec6edbe7965b8f0f1193999785037e + 951b1ad8c1ade424930ec5697fd9b46d1d170db4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e708867037ec6edbe7965b8f0f1193999785037e + 951b1ad8c1ade424930ec5697fd9b46d1d170db4 https://github.com/dotnet/windowsdesktop @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + 2f740adc1457e8a28c1c072993b66f515977eb51 @@ -47,9 +47,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/aspnetcore @@ -59,25 +59,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e882394a7bb38930da748291fe2c2ceaa6a80588 + b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb https://github.com/dotnet/test-templates @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5742a78782052538603f91507bf5d276f51e7300 + acd467496cf41224b70e0e25aa05bb8cde28c5eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5742a78782052538603f91507bf5d276f51e7300 + acd467496cf41224b70e0e25aa05bb8cde28c5eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3991c2606be14a6faf29eeafe824bd4444e85ea1 + b47cabfdc9c35f9b3305e5e11c2957d81fee26af - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5d6364723197e917e11c0d442545287c27754aa5 + 2a2301468b4a483e4c11f763ff7f131c6ff70bc2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9bc93242d..b1c6a513a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.4-servicing.21117.2 + 5.0.5-servicing.21167.1 - 5.0.4-servicing.21117.5 + 5.0.5-servicing.21167.2 @@ -43,39 +43,39 @@ - 5.0.4 + 5.0.5 5.0.0 5.0.0-rtm.20526.5 - 5.0.4-servicing.21118.15 - 5.0.4-servicing.21118.15 - 5.0.4-servicing.21118.15 + 5.0.5-servicing.21167.8 + 5.0.5-servicing.21167.8 + 5.0.5-servicing.21167.8 0.2.0 - 5.0.202-servicing.21168.6 - 5.0.202-servicing.21168.6 + 5.0.202-servicing.21168.16 + 5.0.202-servicing.21168.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.4-servicing.21116.14 - 5.0.4 - 5.0.4 + 5.0.5-servicing.21166.9 + 5.0.5 + 5.0.5 5.0.0 - 5.0.4 - 5.0.1 + 5.0.5 + 5.0.2 2.1.0 5.0.0-rtm.20519.4 - 5.0.4-servicing.21117.9 - 5.0.4 + 5.0.5-servicing.21167.2 + 5.0.5 5.0.0 5.0.0-rtm.20520.1 From 748f5c681b8bcb7ec9ef65de459239973d48f70f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 20 Mar 2021 02:20:19 +0000 Subject: [PATCH 030/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.20604.1 to 5.0.0-rtm.21161.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1878833cc..82043fa4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acd467496cf41224b70e0e25aa05bb8cde28c5eb + a72246a718539102e538d046e60ef93072370898 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - acd467496cf41224b70e0e25aa05bb8cde28c5eb + a72246a718539102e538d046e60ef93072370898 @@ -116,9 +116,9 @@ https://github.com/microsoft/vstest 6a858a323caa439115e9e3cf1c958b04f4ff9993 - + https://github.com/mono/linker - 0497f2ad6a13fe9c240a1a79bb07bd1fcbc73b9d + c43f981eec336c1dc4fd0ead84b5e09db9377d9e linker diff --git a/eng/Versions.props b/eng/Versions.props index b1c6a513a..06674acdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21168.16 - 5.0.202-servicing.21168.16 + 5.0.202-servicing.21169.9 + 5.0.202-servicing.21169.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3346fa974fffdbb431685520cce0ff793568499a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 Mar 2021 21:46:56 +0000 Subject: [PATCH 031/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- 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 82043fa4d..bdb03e260 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a72246a718539102e538d046e60ef93072370898 + 461a94d08054f1b683ef2855c18acf9de0e1175c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a72246a718539102e538d046e60ef93072370898 + 461a94d08054f1b683ef2855c18acf9de0e1175c diff --git a/eng/Versions.props b/eng/Versions.props index 06674acdc..f6952f2ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21169.9 - 5.0.202-servicing.21169.9 + 5.0.202-servicing.21172.7 + 5.0.202-servicing.21172.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e425b1dca0a7a9c800a1e739a6b7e7934ebc7bb7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 30 Mar 2021 10:24:17 -0700 Subject: [PATCH 032/118] We were incorrectly includes .net core files and targets in the VS swr file. --- src/redist/targets/GenerateMSBuildExtensions.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/redist/targets/GenerateMSBuildExtensions.targets b/src/redist/targets/GenerateMSBuildExtensions.targets index 2936166f7..38bf5c09c 100644 --- a/src/redist/targets/GenerateMSBuildExtensions.targets +++ b/src/redist/targets/GenerateMSBuildExtensions.targets @@ -29,9 +29,14 @@ + + + + + From db7cc87d512335808e3806067f2bf9b31379e1db Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 1 Apr 2021 22:02:02 +0000 Subject: [PATCH 033/118] Merged PR 13895: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Test.Sdk**: from 16.9.1-release-20210308-01 to 16.9.4 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 5.9.1-rc.1 to 5.9.1-rc.8 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210401.17 - **Date Produced**: 4/1/2021 9:22 PM - **Commit**: 51369266643769f9f0c1184e89715cd1045126d0 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.202-servicing.21172.7 to 5.0.202-servicing.21201.17][1] - **Microsoft.NET.Sdk**: [from 5.0.202-servicing.21172.7 to 5.0.202-servicing.21201.17][1] - **Microsoft.NET.Test.Sdk**: [from 16.9.1-release-20210308-01 to 16.9.4][2] - **NuGet.Build.Tasks**: [from 5.9.1-rc.1 to 5.9.1-rc.8][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC461a94d&targetVersion=GC5136926&_a=files [2]: https://github.com/microsoft/vstest/compare/6a858a3...99b911a [3]: https://github.com/nuget/nuget.client/compare/fad4343...d525b0e [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 53f355d24..8b3db04dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,17 +10,26 @@ + + + + + + + + + @@ -42,9 +51,14 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdb03e260..b1bd24113 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 461a94d08054f1b683ef2855c18acf9de0e1175c + 51369266643769f9f0c1184e89715cd1045126d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 461a94d08054f1b683ef2855c18acf9de0e1175c + 51369266643769f9f0c1184e89715cd1045126d0 @@ -112,9 +112,9 @@ https://github.com/dotnet/fsharp 7ce7132f1459095e635194d09d6f73265352029a - + https://github.com/microsoft/vstest - 6a858a323caa439115e9e3cf1c958b04f4ff9993 + 99b911a57a02fc5d2eeef23e9ab8cbea4505678b https://github.com/mono/linker @@ -129,9 +129,9 @@ https://github.com/dotnet/msbuild 5e4b48a27efce55a613664b58d353ab4c8d1f6c1 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - fad4343fa8ba919bb8a1b86bb22310824bf14268 + + https://github.com/nuget/nuget.client + d525b0e670f3b6cbd5c73a35f04730a9f658c852 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index f6952f2ca..76ed00f75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21172.7 - 5.0.202-servicing.21172.7 + 5.0.202-servicing.21201.17 + 5.0.202-servicing.21201.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.9.1-release-20210308-01 + 16.9.4 From a5a666645966f125802b656333f7b16256c6421f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Apr 2021 09:21:40 -0700 Subject: [PATCH 034/118] Update branding for 5.0.2xx 5.0.2xx --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a63e7e202..0d488c507 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 27a91459e07ec091fcfb89eb132a57037d066e42 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 8 Apr 2021 00:21:11 +0000 Subject: [PATCH 035/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 22 ---------------------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b3db04dc..770af0ccb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,30 +7,16 @@ - - - - - - - - - - - - - - @@ -47,18 +33,10 @@ - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1bd24113..5d7fe4832 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51369266643769f9f0c1184e89715cd1045126d0 + 44e499a59bcca0444e0724cc73d3c576b12bc727 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 51369266643769f9f0c1184e89715cd1045126d0 + 44e499a59bcca0444e0724cc73d3c576b12bc727 diff --git a/eng/Versions.props b/eng/Versions.props index d26bbcc9a..120ee7a88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.202-servicing.21201.17 - 5.0.202-servicing.21201.17 + 5.0.203-servicing.21207.17 + 5.0.203-servicing.21207.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 78ad023e02f3915089a922385ab06379312aa968 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 9 Apr 2021 04:22:45 +0000 Subject: [PATCH 036/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- 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 5d7fe4832..0c4e2da4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 8470ff317250d761c72f920b8ea1c0700b230eb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 44e499a59bcca0444e0724cc73d3c576b12bc727 + d5e080154aebfd2cde43892175b75a486a9dd62c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 44e499a59bcca0444e0724cc73d3c576b12bc727 + d5e080154aebfd2cde43892175b75a486a9dd62c diff --git a/eng/Versions.props b/eng/Versions.props index 120ee7a88..a4c314282 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21207.17 - 5.0.203-servicing.21207.17 + 5.0.203-servicing.21208.11 + 5.0.203-servicing.21208.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 32fb096a9db6e6b8f6840bf6b5186d1f5d48769d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 12 Apr 2021 12:20:08 +0000 Subject: [PATCH 037/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.202 to 5.0.203 (parent: Microsoft.NET.Sdk) --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 770af0ccb..0611db52f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c4e2da4e..80b5e1cb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,17 +87,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 8470ff317250d761c72f920b8ea1c0700b230eb3 + 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d5e080154aebfd2cde43892175b75a486a9dd62c + f2f7cd0b625c211ded10a6f223252770e9eb0e64 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d5e080154aebfd2cde43892175b75a486a9dd62c + f2f7cd0b625c211ded10a6f223252770e9eb0e64 diff --git a/eng/Versions.props b/eng/Versions.props index a4c314282..84262349f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.202 + 5.0.203 @@ -55,8 +55,8 @@ - 5.0.203-servicing.21208.11 - 5.0.203-servicing.21208.11 + 5.0.203-servicing.21209.7 + 5.0.203-servicing.21209.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b335e6569acae2cda624891b4fc6c1dce83297c2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 12 Apr 2021 23:32:45 +0000 Subject: [PATCH 038/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- 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 80b5e1cb2..ec1c9c699 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2f7cd0b625c211ded10a6f223252770e9eb0e64 + fa4a14a82c15e1fa02f0ff473c9b4a9d9f994af9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f2f7cd0b625c211ded10a6f223252770e9eb0e64 + fa4a14a82c15e1fa02f0ff473c9b4a9d9f994af9 diff --git a/eng/Versions.props b/eng/Versions.props index 84262349f..a8929b79c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21209.7 - 5.0.203-servicing.21209.7 + 5.0.203-servicing.21212.6 + 5.0.203-servicing.21212.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7751fb29960fdbfb46207f9027ca1425fafed14f Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 13 Apr 2021 11:08:13 -0700 Subject: [PATCH 039/118] Update aspnetcore 2.1 & 3.1 template versions (#10169) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0d488c507..9632193aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ 3.1.10 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.13 + 3.1.14 3.2.1 4.8.0-rc2.19462.10 @@ -121,7 +121,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.26 + 2.1.27 From fd2fca7ba5db9082b8917f6f6e10b2b4b2d28e92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 18:13:34 +0000 Subject: [PATCH 040/118] Update dependencies from https://github.com/dotnet/arcade build 20210310.3 (#10201) [release/5.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b16b68bf..e6fa03d3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 + 670382be6a978ba401c21c57ba44311199d2682a - + https://github.com/dotnet/arcade - 917ded6b428fc30b40f5ba4e35eb0c863d7f69e1 + 670382be6a978ba401c21c57ba44311199d2682a https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9632193aa..f23b3c26a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21159.7 + 5.0.0-beta.21160.3 diff --git a/global.json b/global.json index 5760c69fc..33c984f8f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3" } } From ca9be29c87064da28527fba3989a97979a04f9d7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 13 Apr 2021 11:34:06 -0700 Subject: [PATCH 041/118] Remove internal feed --- NuGet.config | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b3db04dc..3d19a63c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,8 +14,6 @@ - - @@ -26,11 +23,6 @@ - - - - - @@ -47,18 +39,10 @@ - - - - - - - - From cb7f067d43d2eb3f91e70471d5dd090b798ab367 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 13 Apr 2021 21:25:31 +0000 Subject: [PATCH 042/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- 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 c1c334088..ade825186 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa4a14a82c15e1fa02f0ff473c9b4a9d9f994af9 + 770f6efa8f93e94d8b775fb3f99f96e1606d72fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fa4a14a82c15e1fa02f0ff473c9b4a9d9f994af9 + 770f6efa8f93e94d8b775fb3f99f96e1606d72fd diff --git a/eng/Versions.props b/eng/Versions.props index 65c32602e..3637963c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21212.6 - 5.0.203-servicing.21212.6 + 5.0.203-servicing.21213.9 + 5.0.203-servicing.21213.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ee8601ef0640489f37445d553bed54d09ef7e247 Mon Sep 17 00:00:00 2001 From: Joshua Larkin <70237359+j0shuams@users.noreply.github.com> Date: Tue, 13 Apr 2021 16:00:33 -0700 Subject: [PATCH 043/118] Update Windows SDK Projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 7225dae04..0c9340dc6 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.15 - 10.0.18362.15 - 10.0.19041.15 + 10.0.17763.16 + 10.0.18362.16 + 10.0.19041.16 From 8d820acefd1813d2c839626374c69da635bf14c4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 14 Apr 2021 01:49:07 +0000 Subject: [PATCH 044/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- 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 ade825186..a1be2d687 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 770f6efa8f93e94d8b775fb3f99f96e1606d72fd + d3ce1db41d4bba90dce9a8afb5c66f8f2f0f6708 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 770f6efa8f93e94d8b775fb3f99f96e1606d72fd + d3ce1db41d4bba90dce9a8afb5c66f8f2f0f6708 diff --git a/eng/Versions.props b/eng/Versions.props index 3637963c3..7c398dd4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21213.9 - 5.0.203-servicing.21213.9 + 5.0.203-servicing.21213.20 + 5.0.203-servicing.21213.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 79cc44c283182d1986aee511d31e9c3813f423c6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 14 Apr 2021 11:07:56 +0000 Subject: [PATCH 045/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21161.4 to 5.0.0-rtm.21213.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1be2d687..fe343fe5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3ce1db41d4bba90dce9a8afb5c66f8f2f0f6708 + 6135be1d982b2e788e5bbe2247bdac778bea49f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3ce1db41d4bba90dce9a8afb5c66f8f2f0f6708 + 6135be1d982b2e788e5bbe2247bdac778bea49f4 @@ -116,9 +116,9 @@ https://github.com/microsoft/vstest 99b911a57a02fc5d2eeef23e9ab8cbea4505678b - + https://github.com/mono/linker - c43f981eec336c1dc4fd0ead84b5e09db9377d9e + 311102e38b4f925856f73af7a83da1ee4ded7af9 linker diff --git a/eng/Versions.props b/eng/Versions.props index 7c398dd4d..5ef47b730 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21213.20 - 5.0.203-servicing.21213.20 + 5.0.203-servicing.21214.4 + 5.0.203-servicing.21214.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 31d21a27468a1c731c07c8d255fef2ca61bf7132 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 14 Apr 2021 12:06:18 +0000 Subject: [PATCH 046/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.5-servicing.21167.2 to 5.0.6-servicing.21213.7 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.5-servicing.21167.1 to 5.0.6-servicing.21213.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.5-servicing.21167.2 to 5.0.6-servicing.21213.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 2 ++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0611db52f..3d9333e5a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + @@ -38,6 +39,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe343fe5d..962dbaad1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 951b1ad8c1ade424930ec5697fd9b46d1d170db4 + cfda81600ad554e8c9da7cad1a8311353c636e37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 951b1ad8c1ade424930ec5697fd9b46d1d170db4 + cfda81600ad554e8c9da7cad1a8311353c636e37 https://github.com/dotnet/windowsdesktop @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6135be1d982b2e788e5bbe2247bdac778bea49f4 + c2a45c964b64f8ed42dcc7cc994da69d7c4b429b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6135be1d982b2e788e5bbe2247bdac778bea49f4 + c2a45c964b64f8ed42dcc7cc994da69d7c4b429b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b47cabfdc9c35f9b3305e5e11c2957d81fee26af + 7c6c603e2b02d7fca1798ca81f54b4d8a138ef76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2a2301468b4a483e4c11f763ff7f131c6ff70bc2 + 579c479f4eb426358932afdd62b695ea999de426 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5ef47b730..6137be45c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.5-servicing.21167.1 + 5.0.6-servicing.21213.9 - 5.0.5-servicing.21167.2 + 5.0.6-servicing.21213.16 @@ -55,8 +55,8 @@ - 5.0.203-servicing.21214.4 - 5.0.203-servicing.21214.4 + 5.0.203-servicing.21214.5 + 5.0.203-servicing.21214.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -74,8 +74,8 @@ - 5.0.5-servicing.21167.2 - 5.0.5 + 5.0.6-servicing.21213.7 + 5.0.6 5.0.0 5.0.0-rtm.20520.1 From 9e78852ef837c4e5e14d8923705489ae45137fc0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Apr 2021 12:55:15 +0000 Subject: [PATCH 047/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.5-servicing.21166.9 to 5.0.6-servicing.21209.7 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.5 to 5.0.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.5-servicing.21167.8 to 5.0.6-servicing.21213.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 5.0.203 to 5.0.203 (parent: Microsoft.NET.Sdk) --- NuGet.config | 6 +++++- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++++---------- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d9333e5a..a528669d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,17 @@ + + - + @@ -35,8 +37,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 962dbaad1..b4917dbeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + 84b30748fccccc0247181b615946aac10870364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + 84b30748fccccc0247181b615946aac10870364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + 84b30748fccccc0247181b615946aac10870364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + 84b30748fccccc0247181b615946aac10870364d @@ -59,25 +59,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb + 150a0d45d3da3bf607115232fe229016cc52bac4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb + 150a0d45d3da3bf607115232fe229016cc52bac4 https://github.com/dotnet/efcore 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb + 150a0d45d3da3bf607115232fe229016cc52bac4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb + 150a0d45d3da3bf607115232fe229016cc52bac4 https://github.com/dotnet/test-templates @@ -89,15 +89,15 @@ https://github.com/dotnet/templating - 6992e5df30f85b72ec7f3a3fd003f65e98c62b0a + 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2a45c964b64f8ed42dcc7cc994da69d7c4b429b + b4fcff665da1b63016780335179e0d5e302c7deb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c2a45c964b64f8ed42dcc7cc994da69d7c4b429b + b4fcff665da1b63016780335179e0d5e302c7deb diff --git a/eng/Versions.props b/eng/Versions.props index 6137be45c..67a5c1fff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,31 +43,31 @@ - 5.0.5 + 5.0.6 5.0.0 5.0.0-rtm.20526.5 - 5.0.5-servicing.21167.8 - 5.0.5-servicing.21167.8 - 5.0.5-servicing.21167.8 + 5.0.6-servicing.21213.4 + 5.0.6-servicing.21213.4 + 5.0.6-servicing.21213.4 0.2.0 - 5.0.203-servicing.21214.5 - 5.0.203-servicing.21214.5 + 5.0.203-servicing.21216.5 + 5.0.203-servicing.21216.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.5-servicing.21166.9 - 5.0.5 - 5.0.5 + 5.0.6-servicing.21209.7 + 5.0.6 + 5.0.6 5.0.0 - 5.0.5 + 5.0.6 5.0.2 2.1.0 5.0.0-rtm.20519.4 From ff5e718c8bb1f39a880b5254924ac84759ada9d5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 16 Apr 2021 14:21:30 +0000 Subject: [PATCH 048/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.6-servicing.21213.4 to 5.0.6-servicing.21214.11 (parent: Microsoft.NET.Sdk) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index a528669d5..bc1db7644 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4917dbeb..fe020d9a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,23 +61,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 150a0d45d3da3bf607115232fe229016cc52bac4 + 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 150a0d45d3da3bf607115232fe229016cc52bac4 + 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 https://github.com/dotnet/efcore 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 150a0d45d3da3bf607115232fe229016cc52bac4 + 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 150a0d45d3da3bf607115232fe229016cc52bac4 + 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b4fcff665da1b63016780335179e0d5e302c7deb + aeaa679b6eebd74eb26acb13457808cfe0892b18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b4fcff665da1b63016780335179e0d5e302c7deb + aeaa679b6eebd74eb26acb13457808cfe0892b18 diff --git a/eng/Versions.props b/eng/Versions.props index 67a5c1fff..f8d89112e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,17 +46,17 @@ 5.0.6 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21213.4 - 5.0.6-servicing.21213.4 - 5.0.6-servicing.21213.4 + 5.0.6-servicing.21214.11 + 5.0.6-servicing.21214.11 + 5.0.6-servicing.21214.11 0.2.0 - 5.0.203-servicing.21216.5 - 5.0.203-servicing.21216.5 + 5.0.203-servicing.21216.8 + 5.0.203-servicing.21216.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 60d5db0540e9f46bf9f961e12363c169532830c6 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Apr 2021 15:40:47 +0000 Subject: [PATCH 049/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.NETCore.App.Internal: from 5.0.6-servicing.21209.7 to 5.0.6-servicing.21220.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) --- NuGet.config | 13 +++++++++++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc1db7644..7af97913d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + - + + + + @@ -38,9 +44,12 @@ + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe020d9a7..97b020a3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aeaa679b6eebd74eb26acb13457808cfe0892b18 + 38078c107fda315d87ab4c922ab45a4baa2bdea7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aeaa679b6eebd74eb26acb13457808cfe0892b18 + 38078c107fda315d87ab4c922ab45a4baa2bdea7 diff --git a/eng/Versions.props b/eng/Versions.props index f8d89112e..56ff5fa22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,15 +55,15 @@ - 5.0.203-servicing.21216.8 - 5.0.203-servicing.21216.8 + 5.0.203-servicing.21221.5 + 5.0.203-servicing.21221.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.6-servicing.21209.7 + 5.0.6-servicing.21220.11 5.0.6 5.0.6 5.0.0 From db8ff75c705e4c5db42bd55561c8bcd3aa73ea0f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Apr 2021 17:41:26 +0000 Subject: [PATCH 050/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 5.0.6-servicing.21214.11 to 5.0.6-servicing.21221.2 (parent: Microsoft.NET.Sdk) --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7af97913d..5e1180481 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,7 @@ - - - - + @@ -43,10 +40,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97b020a3b..af7eb3792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,23 +61,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 + f3eeec88e64270e9e783d713fea8503f28b1a932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 + f3eeec88e64270e9e783d713fea8503f28b1a932 https://github.com/dotnet/efcore 54203510db732a088a3e7e58d49b98ada7c14227 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 + f3eeec88e64270e9e783d713fea8503f28b1a932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8b2dab3b0ce2a88856332f0e41731f4fd701bd25 + f3eeec88e64270e9e783d713fea8503f28b1a932 https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38078c107fda315d87ab4c922ab45a4baa2bdea7 + 5dc9df7e7248f0e9ec80d29157914dc82e904080 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 38078c107fda315d87ab4c922ab45a4baa2bdea7 + 5dc9df7e7248f0e9ec80d29157914dc82e904080 diff --git a/eng/Versions.props b/eng/Versions.props index 56ff5fa22..25d150f72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,17 +46,17 @@ 5.0.6 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21214.11 - 5.0.6-servicing.21214.11 - 5.0.6-servicing.21214.11 + 5.0.6-servicing.21221.2 + 5.0.6-servicing.21221.2 + 5.0.6-servicing.21221.2 0.2.0 - 5.0.203-servicing.21221.5 - 5.0.203-servicing.21221.5 + 5.0.203-servicing.21221.9 + 5.0.203-servicing.21221.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 16145475d871509500be175d7774ded4ec8d2a61 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Apr 2021 22:36:48 +0000 Subject: [PATCH 051/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App: from 5.0.6-servicing.21213.7 to 5.0.6-servicing.21221.6 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 5.0.6-servicing.21213.9 to 5.0.6-servicing.21221.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 5.0.6-servicing.21213.16 to 5.0.6-servicing.21221.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e1180481..61f217cfa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af7eb3792..ad030ca15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfda81600ad554e8c9da7cad1a8311353c636e37 + 297185fc6039237591fb28a8a09fc01d2ea69ae6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cfda81600ad554e8c9da7cad1a8311353c636e37 + 297185fc6039237591fb28a8a09fc01d2ea69ae6 https://github.com/dotnet/windowsdesktop @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dc9df7e7248f0e9ec80d29157914dc82e904080 + 61764b9eb3ba1699eec1f813a472b85de8186396 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5dc9df7e7248f0e9ec80d29157914dc82e904080 + 61764b9eb3ba1699eec1f813a472b85de8186396 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 7c6c603e2b02d7fca1798ca81f54b4d8a138ef76 + 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 579c479f4eb426358932afdd62b695ea999de426 + fe9dd395134709b5a53883b71c01447b5f132a06 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 25d150f72..59b283c9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.6-servicing.21213.9 + 5.0.6-servicing.21221.3 - 5.0.6-servicing.21213.16 + 5.0.6-servicing.21221.8 @@ -55,8 +55,8 @@ - 5.0.203-servicing.21221.9 - 5.0.203-servicing.21221.9 + 5.0.203-servicing.21221.21 + 5.0.203-servicing.21221.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -74,7 +74,7 @@ - 5.0.6-servicing.21213.7 + 5.0.6-servicing.21221.6 5.0.6 5.0.0 5.0.0-rtm.20520.1 From b5f47e6c6aa198df48121dc3076c9626f50b116e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 22 Apr 2021 18:10:07 +0000 Subject: [PATCH 052/118] Merged PR 14458: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.ILLink.Tasks**: from 5.0.0-rtm.21213.1 to 5.0.0-rtm.21221.2 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210422.11 - **Date Produced**: 4/22/2021 5:53 PM - **Commit**: b8025906f7463b6e477893c81238dc7003b353a3 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.203-servicing.21221.21 to 5.0.203-servicing.21222.11][1] - **Microsoft.NET.Sdk**: [from 5.0.203-servicing.21221.21 to 5.0.203-servicing.21222.11][1] - **Microsoft.NET.ILLink.Tasks**: [from 5.0.0-rtm.21213.1 to 5.0.0-rtm.21221.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC61764b9&targetVersion=GCb802590&_a=files [2]: https://github.com/mono/linker/compare/311102e...6a15056 [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad030ca15..8a03e4e8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61764b9eb3ba1699eec1f813a472b85de8186396 + b8025906f7463b6e477893c81238dc7003b353a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61764b9eb3ba1699eec1f813a472b85de8186396 + b8025906f7463b6e477893c81238dc7003b353a3 @@ -116,9 +116,9 @@ https://github.com/microsoft/vstest 99b911a57a02fc5d2eeef23e9ab8cbea4505678b - + https://github.com/mono/linker - 311102e38b4f925856f73af7a83da1ee4ded7af9 + 6a15056a9d71169bf04d007301edfd558afcfa6a linker diff --git a/eng/Versions.props b/eng/Versions.props index 59b283c9c..1ec3a417b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21221.21 - 5.0.203-servicing.21221.21 + 5.0.203-servicing.21222.11 + 5.0.203-servicing.21222.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 383637d63f76578633966bfa99d6ae38820e8dbd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Apr 2021 22:29:51 +0000 Subject: [PATCH 053/118] Merged PR 14475: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.EntityFrameworkCore**: from 5.0.5 to 5.0.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - **dotnet-dev-certs**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210423.17 - **Date Produced**: 4/23/2021 9:02 PM - **Commit**: 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.203-servicing.21222.11 to 5.0.203-servicing.21223.17][1] - **Microsoft.NET.Sdk**: [from 5.0.203-servicing.21222.11 to 5.0.203-servicing.21223.17][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 5.0.6 to 5.0.6][2] - **Microsoft.EntityFrameworkCore**: [from 5.0.5 to 5.0.6][3] - **dotnet-dev-certs**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2] - **dotnet-user-secrets**: [from 5.0.6-servicing.21221.2 to 5.0.6-servicing.21223.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb802590&targetVersion=GC7cebab8&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCf3eeec8&targetVersion=GCdc5e11a&_a=files [3]: https://github.com/dotnet/efcore/compare/5420351...42e8143 [DependencyUpdate]: <> (End) [marker]: <> (End:fec1f9ef-909e-4396-5b7d-08d8d784082a) --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 10 +++++----- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61f217cfa..be7ee6a60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + + + + + + + + @@ -40,13 +47,20 @@ - + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a03e4e8e..cc8272844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,23 +61,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f3eeec88e64270e9e783d713fea8503f28b1a932 + dc5e11abdb05b322f4b74b3afbcfb352fe984b2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f3eeec88e64270e9e783d713fea8503f28b1a932 + dc5e11abdb05b322f4b74b3afbcfb352fe984b2e - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f3eeec88e64270e9e783d713fea8503f28b1a932 + dc5e11abdb05b322f4b74b3afbcfb352fe984b2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f3eeec88e64270e9e783d713fea8503f28b1a932 + dc5e11abdb05b322f4b74b3afbcfb352fe984b2e https://github.com/dotnet/test-templates @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8025906f7463b6e477893c81238dc7003b353a3 + 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b8025906f7463b6e477893c81238dc7003b353a3 + 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 diff --git a/eng/Versions.props b/eng/Versions.props index 1ec3a417b..65a57890f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,17 +46,17 @@ 5.0.6 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21221.2 - 5.0.6-servicing.21221.2 - 5.0.6-servicing.21221.2 + 5.0.6-servicing.21223.5 + 5.0.6-servicing.21223.5 + 5.0.6-servicing.21223.5 0.2.0 - 5.0.203-servicing.21222.11 - 5.0.203-servicing.21222.11 + 5.0.203-servicing.21223.17 + 5.0.203-servicing.21223.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4b2717782395e7633f4c3ff9fb39fa378643eb1a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 4 May 2021 11:46:30 -0700 Subject: [PATCH 054/118] Update branding for 5.0.2xx 5.0.2xx --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index eb384403a..59a100f5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 6022619eaa97d92b388dbc71a0de75334f27f34c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 4 May 2021 14:47:35 -0700 Subject: [PATCH 055/118] Update sdl-tsa-vars.config --- eng/sdl-tsa-vars.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/sdl-tsa-vars.config b/eng/sdl-tsa-vars.config index 64aa69b44..433230ad5 100644 --- a/eng/sdl-tsa-vars.config +++ b/eng/sdl-tsa-vars.config @@ -3,7 +3,7 @@ -TsaProjectName DEVDIV -TsaNotificationEmail dotnetdevexcli@microsoft.com -TsaCodebaseAdmin REDMOND\marcpop --TsaBugAreaPath "DevDiv\NET Tools\CLI" +-TsaBugAreaPath "DevDiv\NET Tools\SDK" -TsaIterationPath DevDiv -TsaRepositoryName dotnet-installer -TsaCodebaseName dotnet-installer From 0c1b8bc1d70d0503f35637f632d11330964cee2d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 4 May 2021 23:44:05 +0000 Subject: [PATCH 056/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk --- NuGet.config | 20 +++++++++++++++++++- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7ee6a60..ffb8742a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,12 +7,18 @@ + + + + + + @@ -20,6 +26,8 @@ + + @@ -28,6 +36,8 @@ + + @@ -47,20 +57,28 @@ + + + + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc8272844..69aa71cdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -91,13 +91,13 @@ https://github.com/dotnet/templating 50e1aa014b0b35cb9aa2c5157d054ee654949dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 + b88b667c267847eaa9adca5c4ea4336e428e5545 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7cebab8eb86c5cd2236cfbc3b09295e5ab61fbd9 + b88b667c267847eaa9adca5c4ea4336e428e5545 diff --git a/eng/Versions.props b/eng/Versions.props index 65a57890f..c1eacc14a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.203-servicing.21223.17 - 5.0.203-servicing.21223.17 + 5.0.204-servicing.21254.16 + 5.0.204-servicing.21254.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From db6d94e0674ce48f6b359828ff7d70595f68b458 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 11 May 2021 11:40:33 -0700 Subject: [PATCH 057/118] Update aspnet 2.1/3.1 template version (#10484) --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 59a100f5b..bb8945d66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,10 +103,10 @@ 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 1.7.2 - 3.1.10 + 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.14 + 3.1.15 3.2.1 4.8.0-rc2.19462.10 @@ -121,7 +121,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.20420.1 - 2.1.27 + 2.1.28 From ccbf9e46d98199c5227e0fd59afdacde2eafc91e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 11 May 2021 13:27:54 -0700 Subject: [PATCH 058/118] Update NuGet.config --- NuGet.config | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1064db659..45e09c64d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,10 @@ -<<<<<<< HEAD -======= ->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd -<<<<<<< HEAD -======= ->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd @@ -29,9 +23,6 @@ -<<<<<<< HEAD -======= ->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd @@ -48,19 +39,12 @@ -<<<<<<< HEAD - -======= - - - ->>>>>>> 383637d63f76578633966bfa99d6ae38820e8dbd From f9399e79adec387e7641b3131d58adb677502cf0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 May 2021 03:19:24 +0000 Subject: [PATCH 059/118] [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.203 to 5.0.204 (parent: Microsoft.NET.Sdk) --- NuGet.config | 9 +-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index ffb8742a3..fd1a511db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,14 +26,7 @@ - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69aa71cdf..686c178b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,17 +87,17 @@ https://github.com/dotnet/test-templates a2b05d8171915c69ad97ab5d49bbb07d2c780a67 - + https://github.com/dotnet/templating - 50e1aa014b0b35cb9aa2c5157d054ee654949dff + 3cdb1866b853838a7881187b994836b98d240d0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b88b667c267847eaa9adca5c4ea4336e428e5545 + c218ec378010c8ebca98d41cecb7b1b17e73c851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b88b667c267847eaa9adca5c4ea4336e428e5545 + c218ec378010c8ebca98d41cecb7b1b17e73c851 diff --git a/eng/Versions.props b/eng/Versions.props index c1eacc14a..b73172200 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.203 + 5.0.204 @@ -55,8 +55,8 @@ - 5.0.204-servicing.21254.16 - 5.0.204-servicing.21254.16 + 5.0.204-servicing.21261.22 + 5.0.204-servicing.21261.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2d88de2b5ab5a7eaa09509a1e08142ed5cd61464 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 13 May 2021 10:24:49 -0700 Subject: [PATCH 060/118] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 2328c7bc0..1c05c7213 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -24,7 +24,7 @@ - $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 24)) $([MSBuild]::Add($(VersionFeature), 12)) From e0232bce5b4641e5e8992ca1d8f10c6d2b79b211 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 13 May 2021 10:33:31 -0700 Subject: [PATCH 061/118] Remove unneeded things from nuget.config (#10610) --- NuGet.config | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45e09c64d..daf02ec43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,23 +10,15 @@ - - + + - - - - - - - - @@ -40,15 +32,14 @@ - - + + + + - - - From 29a0b6e22908a030d964230d91ba6ec56afeb798 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Thu, 13 May 2021 15:52:42 -0700 Subject: [PATCH 062/118] Update Windows SDK projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 0c9340dc6..a9c76ddc8 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,8 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.16 - 10.0.18362.16 - 10.0.19041.16 + 10.0.17763.17 + 10.0.18362.17 + 10.0.19041.17 From 84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 14 May 2021 03:05:16 +0000 Subject: [PATCH 063/118] Merged PR 14981: [internal/release/5.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App**: from 5.0.6-servicing.21221.6 to 5.0.7-servicing.21263.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Internal**: from 5.0.6-servicing.21220.11 to 5.0.7-servicing.21255.8 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.EntityFrameworkCore**: from 5.0.6 to 5.0.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64) - **dotnet-dev-certs**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 5.0.6-servicing.21223.5 to 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 5.0.6-servicing.21221.3 to 5.0.7-servicing.21263.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 5.0.6 to 5.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 5.0.6-servicing.21221.8 to 5.0.6-servicing.21263.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:fec1f9ef-909e-4396-5b7d-08d8d784082a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: fec1f9ef-909e-4396-5b7d-08d8d784082a - **Build**: 20210513.30 - **Date Produced**: 5/14/2021 2:39 AM - **Commit**: b4ddf0facd49caab999e4accd6cb82d5e599bf5e - **Branch**: refs/heads/internal/release/5.0.2xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 5.0.204-servicing.21261.22 to 5.0.204-servicing.21263.30][1] - **Microsoft.NET.Sdk**: [from 5.0.204-servicing.21261.22 to 5.0.204-servicing.21263.30][1] - **Microsoft.WindowsDesktop.App**: [from 5.0.6-servicing.21221.6 to 5.0.7-servicing.21263.4][2] - **Microsoft.NETCore.App.Internal**: [from 5.0.6-servicing.... --- NuGet.config | 9 +++++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index daf02ec43..64d79b4b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,21 @@ + + + + + @@ -31,14 +36,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 686c178b7..fca76c552 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 https://github.com/dotnet/windowsdesktop @@ -25,21 +25,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e @@ -59,25 +59,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 https://github.com/dotnet/test-templates @@ -91,22 +91,22 @@ https://github.com/dotnet/templating 3cdb1866b853838a7881187b994836b98d240d0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c218ec378010c8ebca98d41cecb7b1b17e73c851 + b4ddf0facd49caab999e4accd6cb82d5e599bf5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c218ec378010c8ebca98d41cecb7b1b17e73c851 + b4ddf0facd49caab999e4accd6cb82d5e599bf5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70 + 3e5e4f7ca852c8b85899a18efcd114e7ed4ea163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fe9dd395134709b5a53883b71c01447b5f132a06 + 36ec7266b65ec578b5524c998a80e6a8848efb41 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5b31e66c0..63fa2a4ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.6-servicing.21221.3 + 5.0.7-servicing.21263.7 - 5.0.6-servicing.21221.8 + 5.0.6-servicing.21263.3 @@ -43,39 +43,39 @@ - 5.0.6 + 5.0.7 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 0.2.0 - 5.0.204-servicing.21261.22 - 5.0.204-servicing.21261.22 + 5.0.204-servicing.21263.30 + 5.0.204-servicing.21263.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 5.0.6-servicing.21220.11 - 5.0.6 - 5.0.6 + 5.0.7-servicing.21255.8 + 5.0.7 + 5.0.7 5.0.0 - 5.0.6 + 5.0.7 5.0.2 2.1.0 5.0.0-rtm.20519.4 - 5.0.6-servicing.21221.6 - 5.0.6 + 5.0.7-servicing.21263.4 + 5.0.7 5.0.0 5.0.0-rtm.20520.1 From 5b31fca7e82999f82e1f878f4a55f4ed12dbc38f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 20 May 2021 11:21:19 -0700 Subject: [PATCH 064/118] Update Versions.props --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 683a1e541..2f1326301 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,14 +7,14 @@ 5 0 - 3 - 01 + 4 + 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - servicing + preview $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From a33e46e202e88f81ee683806d87466ae0e843167 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 May 2021 06:37:54 +0000 Subject: [PATCH 065/118] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210520.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21270.41 Dependency coherency updates VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 5.0.6-servicing.21223.5 -> To Version 5.0.7-servicing.21263.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 +++++++++++++++++++++- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++++------- 3 files changed, 52 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0781f7034..15a6e1498 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,18 @@ + + + + + + + + + + - + @@ -22,6 +32,18 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6be3f618e..7d446518a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,25 +55,25 @@ https://github.com/dotnet/aspnetcore 371a26f07b23ad77c636332c2dfc0cbd1d8137ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dc5e11abdb05b322f4b74b3afbcfb352fe984b2e + 67acc3d331454956fc06d6de2218a625e3e596f8 https://github.com/dotnet/test-templates @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - - https://github.com/dotnet/sdk - 23b56ae2930ab04967d59485533230e97fe3c34a + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + a52c8e18b667d8d0ac2ef9818aec8730060290b5 - - https://github.com/dotnet/sdk - 23b56ae2930ab04967d59485533230e97fe3c34a + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + a52c8e18b667d8d0ac2ef9818aec8730060290b5 @@ -108,22 +108,22 @@ https://github.com/dotnet/fsharp 1b23bbeda88ea3cb9be9af777f4c99fa8663df81 - + https://github.com/microsoft/vstest - 9b8fac9e1dd2a1a1d7604ec38df6a8b1002c516e + 5c9abb2ae1b0318dc52729a3639e72089c79fb3c https://github.com/mono/linker 6a15056a9d71169bf04d007301edfd558afcfa6a linker - + https://github.com/dotnet/roslyn - dc0aff25e0ace6e6bf98269963612f9a67cdc897 + 029847714208ebe49668667c60ea5b0a294e0fcb - + https://github.com/dotnet/msbuild - 4242f381a90f77f483b123819759db1ff8eddf67 + 2fd48ab730134f7698a14fdd5752349737f0e3bd https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 683a1e541..0f9576c9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,20 +43,20 @@ - 5.0.6 + 5.0.7 5.0.0 5.0.0-rtm.20526.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 - 5.0.6-servicing.21223.5 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 + 5.0.7-servicing.21263.9 0.2.0 - 5.0.301-servicing.21269.13 - 5.0.301-servicing.21269.13 + 5.0.301-servicing.21270.41 + 5.0.301-servicing.21270.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -129,7 +129,7 @@ 2.2.0-beta.19072.10 2.0.0 - 16.10.0-release-20210511-06 + 16.10.0-release-20210520-03 From 4b800362b366da2e8847ce9c9717273629e2c06e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 May 2021 11:40:45 +0000 Subject: [PATCH 066/118] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210521.5 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21271.5 Dependency coherency updates Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 5.0.6-servicing.21220.11 -> To Version 5.0.7-servicing.21255.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++++++++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 15a6e1498..551b73dfe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,6 +19,11 @@ + + + + + @@ -39,6 +44,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d446518a..6fb7451e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,21 +21,21 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a52c8e18b667d8d0ac2ef9818aec8730060290b5 + 8e86aff63cbc2a14a24f321cef946cd435ef277d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a52c8e18b667d8d0ac2ef9818aec8730060290b5 + 8e86aff63cbc2a14a24f321cef946cd435ef277d diff --git a/eng/Versions.props b/eng/Versions.props index 0f9576c9a..7356c4be8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.301-servicing.21270.41 - 5.0.301-servicing.21270.41 + 5.0.301-servicing.21271.5 + 5.0.301-servicing.21271.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,11 +67,11 @@ - 5.0.6-servicing.21220.11 - 5.0.6 - 5.0.6 + 5.0.7-servicing.21255.8 + 5.0.7 + 5.0.7 5.0.0 - 5.0.6 + 5.0.7 2.1.0 From 57dc629f24739c07dfa0ceee111b829f421818e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 21 May 2021 12:30:20 +0000 Subject: [PATCH 067/118] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20210521.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 5.0.301-servicing.21269.13 -> To Version 5.0.301-servicing.21271.7 Dependency coherency updates Microsoft.WindowsDesktop.App,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.EntityFrameworkCore,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 5.0.6-servicing.21221.6 -> To Version 5.0.7-servicing.21263.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++++++++++--- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 551b73dfe..ce028f67b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,11 @@ + + + + + @@ -44,14 +49,19 @@ + + + + + + + + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6fb7451e7..ee245dd20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,13 +5,13 @@ https://github.com/dotnet/windowsdesktop ec2af60c1eb8b2665745750f6445b3ff133178fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 297185fc6039237591fb28a8a09fc01d2ea69ae6 + f87455227b7f349e26043daa2e1b5b86fb381627 https://github.com/dotnet/windowsdesktop @@ -87,22 +87,22 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e86aff63cbc2a14a24f321cef946cd435ef277d + 1555c5a76cb15abb5350aeeffc63d83c3fd2f70f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e86aff63cbc2a14a24f321cef946cd435ef277d + 1555c5a76cb15abb5350aeeffc63d83c3fd2f70f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3b86fe34ae2ef405a49c19997f9f01ed63a2ad70 + 3e5e4f7ca852c8b85899a18efcd114e7ed4ea163 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fe9dd395134709b5a53883b71c01447b5f132a06 + 36ec7266b65ec578b5524c998a80e6a8848efb41 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7356c4be8..78fe44bbd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 5.0.6-servicing.21221.3 + 5.0.7-servicing.21263.7 - 5.0.6-servicing.21221.8 + 5.0.6-servicing.21263.3 @@ -55,8 +55,8 @@ - 5.0.301-servicing.21271.5 - 5.0.301-servicing.21271.5 + 5.0.301-servicing.21271.7 + 5.0.301-servicing.21271.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -76,8 +76,8 @@ - 5.0.6-servicing.21221.6 - 5.0.6 + 5.0.7-servicing.21263.4 + 5.0.7 5.0.0 5.0.0-rtm.20520.1 From f63f994967a520df7fc1dbaa0a3ae280b951a299 Mon Sep 17 00:00:00 2001 From: Sarah Oslund Date: Fri, 21 May 2021 11:20:38 -0700 Subject: [PATCH 068/118] Remove VSRedistCommonNetCoreTargetingPackx6450PackageVersion property --- src/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 8e50a8ff7..5476160e6 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -16,7 +16,7 @@ $(MicrosoftWindowsDesktopAppPackageVersion) - $(VSRedistCommonNetCoreTargetingPackx6450PackageVersion) + 5.0.0-rtm.20563.12 $(MicrosoftAspNetCoreAppRefInternalPackageVersion) $(VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion) 3.0.0 From 978923c1fe2175a22171fe2359df8bca20e0310f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 26 May 2021 20:56:09 +0000 Subject: [PATCH 069/118] Update dependencies from https://github.com/dotnet/sdk build 20210526.7 (#10778) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.10.0-4.21262.12 to 3.11.0-2.21275.21 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.10.0 to 16.11.0-preview-21275-01 (parent: Microsoft.NET.Sdk) --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0781f7034..2e0cafd64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6be3f618e..b1765c77a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://github.com/dotnet/sdk - 23b56ae2930ab04967d59485533230e97fe3c34a + d1f7263fa950f1e784f7c5db8ec93225fc77d859 - + https://github.com/dotnet/sdk - 23b56ae2930ab04967d59485533230e97fe3c34a + d1f7263fa950f1e784f7c5db8ec93225fc77d859 @@ -117,13 +117,13 @@ 6a15056a9d71169bf04d007301edfd558afcfa6a linker - + https://github.com/dotnet/roslyn - dc0aff25e0ace6e6bf98269963612f9a67cdc897 + 421ad6d87e1bc334a3d5ea4771646627acab9e39 - + https://github.com/dotnet/msbuild - 4242f381a90f77f483b123819759db1ff8eddf67 + c1d3185060cc889735e0006cae0d57ac59271ee3 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 2f1326301..070906c33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.301-servicing.21269.13 - 5.0.301-servicing.21269.13 + 5.0.400-preview.21276.7 + 5.0.400-preview.21276.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e424b1822fd4a4a718d6a2ccc6c679bbd902cf9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 17:36:41 +0000 Subject: [PATCH 070/118] Update dependencies from https://github.com/dotnet/sdk build 20210527.9 (#10786) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21275.21 to 3.11.0-2.21276.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1765c77a..d869da8b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://github.com/dotnet/sdk - d1f7263fa950f1e784f7c5db8ec93225fc77d859 + 4e270e977c0d3aaa8674b7225604c00b2c6d129d - + https://github.com/dotnet/sdk - d1f7263fa950f1e784f7c5db8ec93225fc77d859 + 4e270e977c0d3aaa8674b7225604c00b2c6d129d @@ -117,7 +117,7 @@ 6a15056a9d71169bf04d007301edfd558afcfa6a linker - + https://github.com/dotnet/roslyn 421ad6d87e1bc334a3d5ea4771646627acab9e39 diff --git a/eng/Versions.props b/eng/Versions.props index 070906c33..f9b7c205f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21276.7 - 5.0.400-preview.21276.7 + 5.0.400-preview.21277.9 + 5.0.400-preview.21277.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 024913d52ca5cc67ee60728dfb392bdeeea90f4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 20:47:38 +0000 Subject: [PATCH 071/118] Update dependencies from https://github.com/dotnet/sdk build 20210527.15 (#10789) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.10.0-rc.7240 to 5.11.0-rc.8 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d869da8b3..2caad75c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://github.com/dotnet/sdk - 4e270e977c0d3aaa8674b7225604c00b2c6d129d + a78bf613e2fd462f8a304756e46a4791e18cf4d7 - + https://github.com/dotnet/sdk - 4e270e977c0d3aaa8674b7225604c00b2c6d129d + a78bf613e2fd462f8a304756e46a4791e18cf4d7 @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild c1d3185060cc889735e0006cae0d57ac59271ee3 - + https://github.com/nuget/nuget.client - dca1d060f38e1e02f6bfca41e25f081f19fd534b + e1953deb7fc81d3ac6165a7d6a5afafebef2b6f0 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index f9b7c205f..d222a5f25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21277.9 - 5.0.400-preview.21277.9 + 5.0.400-preview.21277.15 + 5.0.400-preview.21277.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f6c28761a5d5680356c6fe16ecc5a39e17dfcc87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 06:20:05 +0000 Subject: [PATCH 072/118] [release/5.0.4xx] Update dependencies from dotnet/sdk (#10812) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21276.3 to 3.11.0-2.21278.9 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.11.0-preview-21275-01 to 16.11.0-preview-21279-05 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2caad75c4..85fc8c733 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating 592742371da1df5b459c4bbf68e05968b5eb750d - + https://github.com/dotnet/sdk - a78bf613e2fd462f8a304756e46a4791e18cf4d7 + c7a5718a37699c33d021572c7a77fb3a3f8ee03b - + https://github.com/dotnet/sdk - a78bf613e2fd462f8a304756e46a4791e18cf4d7 + c7a5718a37699c33d021572c7a77fb3a3f8ee03b @@ -117,13 +117,13 @@ 6a15056a9d71169bf04d007301edfd558afcfa6a linker - + https://github.com/dotnet/roslyn - 421ad6d87e1bc334a3d5ea4771646627acab9e39 + 2111fe2c6aa2e2def95e8d3555b955eb26cd3cff - + https://github.com/dotnet/msbuild - c1d3185060cc889735e0006cae0d57ac59271ee3 + 89bcb9d37d5e01797f283409be952b7b4e360bb9 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index d222a5f25..5f8823c8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21277.15 - 5.0.400-preview.21277.15 + 5.0.400-preview.21280.6 + 5.0.400-preview.21280.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c2e3e267d43ea50689b3b0067ff433fb562f8042 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 1 Jun 2021 11:22:52 -0700 Subject: [PATCH 073/118] Update branding for 5.0.3xx to 302 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 683a1e541..9c208b65d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 3 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From d2bf7aed722a23f2fb2268f7403087fbc62cfa81 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 1 Jun 2021 11:23:12 -0700 Subject: [PATCH 074/118] Update branding for 5.0.2xx to 205 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 63ba0569e..252f2d11c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 2 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From fbb6f434c14762780ea2fe44e557c00578f23e96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Jun 2021 20:47:41 +0000 Subject: [PATCH 075/118] [release/5.0.4xx] Update dependencies from dotnet/sdk (#10830) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 5.0.300-preview.21260.2 to 5.0.400-preview.21302.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85fc8c733..28f7c53e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,17 +83,17 @@ https://github.com/dotnet/test-templates 1b253e1026e865e9c7b125fcbf6a8765030370cf - + https://github.com/dotnet/templating - 592742371da1df5b459c4bbf68e05968b5eb750d + e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - c7a5718a37699c33d021572c7a77fb3a3f8ee03b + 6ec91402a03e54d731666d2d59c416ab4f0bed0a - + https://github.com/dotnet/sdk - c7a5718a37699c33d021572c7a77fb3a3f8ee03b + 6ec91402a03e54d731666d2d59c416ab4f0bed0a diff --git a/eng/Versions.props b/eng/Versions.props index 5f8823c8c..458229dd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 5.0.300-preview.21260.2 + 5.0.400-preview.21302.2 @@ -55,8 +55,8 @@ - 5.0.400-preview.21280.6 - 5.0.400-preview.21280.6 + 5.0.400-preview.21302.7 + 5.0.400-preview.21302.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 60bdd67a5fe157902a6b0788e535644a8a8eb2ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 01:53:37 +0000 Subject: [PATCH 076/118] Update dependencies from https://github.com/dotnet/sdk build 20210602.14 (#10838) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21278.9 to 3.11.0-2.21301.11 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28f7c53e2..1438c6aca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 6ec91402a03e54d731666d2d59c416ab4f0bed0a + e51b6fd03246f34c5396ef9fb9fe0fecdc3b81da - + https://github.com/dotnet/sdk - 6ec91402a03e54d731666d2d59c416ab4f0bed0a + e51b6fd03246f34c5396ef9fb9fe0fecdc3b81da @@ -117,9 +117,9 @@ 6a15056a9d71169bf04d007301edfd558afcfa6a linker - + https://github.com/dotnet/roslyn - 2111fe2c6aa2e2def95e8d3555b955eb26cd3cff + 757770cf2b5fcc3ffa83db516f90f0d2366a92f0 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 458229dd4..c62f9abee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21302.7 - 5.0.400-preview.21302.7 + 5.0.400-preview.21302.14 + 5.0.400-preview.21302.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e0e9da63d269c7bdd23d26db512aed320dec266 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Jun 2021 23:34:47 +0000 Subject: [PATCH 077/118] [release/5.0.4xx] Update dependencies from dotnet/sdk (#10842) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - NuGet.Build.Tasks: from 5.11.0-rc.8 to 5.11.0-rc.10 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1438c6aca..a6d9de6b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - e51b6fd03246f34c5396ef9fb9fe0fecdc3b81da + 42c87fe576838a0c15e0ea2ff0003548367d662b - + https://github.com/dotnet/sdk - e51b6fd03246f34c5396ef9fb9fe0fecdc3b81da + 42c87fe576838a0c15e0ea2ff0003548367d662b @@ -125,9 +125,9 @@ https://github.com/dotnet/msbuild 89bcb9d37d5e01797f283409be952b7b4e360bb9 - + https://github.com/nuget/nuget.client - e1953deb7fc81d3ac6165a7d6a5afafebef2b6f0 + 112236f486dc18a9281226e342b458079441e403 https://github.com/dotnet/CliCommandLineParser diff --git a/eng/Versions.props b/eng/Versions.props index c62f9abee..5888bd1e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21302.14 - 5.0.400-preview.21302.14 + 5.0.400-preview.21303.15 + 5.0.400-preview.21303.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e5474321322706f552145a05beb79a1924e3202d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 4 Jun 2021 02:18:18 +0000 Subject: [PATCH 078/118] Update dependencies from https://github.com/dotnet/sdk build 20210603.19 (#10843) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21301.11 to 3.11.0-2.21302.15 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 16.11.0-preview-21279-05 to 16.11.0-preview-21302-05 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6d9de6b7..25c83f935 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 42c87fe576838a0c15e0ea2ff0003548367d662b + cf1e93c90a592e3218bc73eff74d221fef6dba9b - + https://github.com/dotnet/sdk - 42c87fe576838a0c15e0ea2ff0003548367d662b + cf1e93c90a592e3218bc73eff74d221fef6dba9b @@ -117,13 +117,13 @@ 6a15056a9d71169bf04d007301edfd558afcfa6a linker - + https://github.com/dotnet/roslyn - 757770cf2b5fcc3ffa83db516f90f0d2366a92f0 + 5b45a56b9b8258e18756ab3981a609fdccf0cb45 - + https://github.com/dotnet/msbuild - 89bcb9d37d5e01797f283409be952b7b4e360bb9 + 5e37cc99288351474bdcbb7c5576026ce5fef056 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 5888bd1e6..14d683435 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21303.15 - 5.0.400-preview.21303.15 + 5.0.400-preview.21303.19 + 5.0.400-preview.21303.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b4d07a717d0f92dec50f1f7edf8b5a834928209d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Jun 2021 15:33:44 +0000 Subject: [PATCH 079/118] Update dependencies from https://github.com/dotnet/sdk build 20210605.3 (#10853) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.11.0-preview-21302-05 to 16.11.0-preview-21305-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25c83f935..889558414 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - cf1e93c90a592e3218bc73eff74d221fef6dba9b + 59b5a4d9c3fe1d7e4f394acded1111429d609a78 - + https://github.com/dotnet/sdk - cf1e93c90a592e3218bc73eff74d221fef6dba9b + 59b5a4d9c3fe1d7e4f394acded1111429d609a78 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 5b45a56b9b8258e18756ab3981a609fdccf0cb45 - + https://github.com/dotnet/msbuild - 5e37cc99288351474bdcbb7c5576026ce5fef056 + f1675f834b94baa4680ebfe4c2ee0327efa2285f https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 14d683435..b386bdb02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21303.19 - 5.0.400-preview.21303.19 + 5.0.400-preview.21305.3 + 5.0.400-preview.21305.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e68bc17b72fe6e887b6a78aecf04ebab2dba9cc Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 8 Jun 2021 09:48:44 -0700 Subject: [PATCH 080/118] Update aspnetcore 3.1 template versions (#10832) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b386bdb02..129b82e4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.15 + 3.1.16 3.2.1 4.8.0-rc2.19462.10 From bc6ab3374ba96d24b4476323499bc57143da40ab Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 8 Jun 2021 09:48:47 -0700 Subject: [PATCH 081/118] Update aspnetcore 3.1 template versions (#10831) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9c208b65d..edd177816 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,7 +108,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.15 + 3.1.16 3.2.1 4.8.0-rc2.19462.10 From 605fba211f683eb1c2e13df5e7c8da4a0e1e55e0 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 8 Jun 2021 09:48:52 -0700 Subject: [PATCH 082/118] Update aspnetcore 3.1 template versions (#10825) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 252f2d11c..a7b179dce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.15 + 3.1.16 3.2.1 4.8.0-rc2.19462.10 From a2e7db07aaa817f4e1ea0b40004a6096711fef9e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 17:00:16 +0000 Subject: [PATCH 083/118] Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10870) [release/5.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- eng/common/generate-locproject.ps1 | 110 +++++++++++++++++++++++ eng/common/templates/job/onelocbuild.yml | 83 +++++++++++++++++ global.json | 2 +- 5 files changed, 199 insertions(+), 6 deletions(-) create mode 100644 eng/common/generate-locproject.ps1 create mode 100644 eng/common/templates/job/onelocbuild.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 889558414..cbc7b8922 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 129b82e4e..136fea7b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21160.3 + 5.0.0-beta.21262.2 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 new file mode 100644 index 000000000..2907f916d --- /dev/null +++ b/eng/common/generate-locproject.ps1 @@ -0,0 +1,110 @@ +Param( + [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here + [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json + [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one + [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally +) + +# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: +# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task + +Set-StrictMode -Version 2.0 +$ErrorActionPreference = "Stop" +. $PSScriptRoot\tools.ps1 + +Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') + +$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusions = @{ Exclusions = @() } +if (Test-Path -Path $exclusionsFilePath) +{ + $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json +} + +Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work + +# Template files +$jsonFiles = @() +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern + +$xlfFiles = @() + +$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" +$langXlfFiles = @() +if ($allXlfFiles) { + $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' + $firstLangCode = $Matches.1 + $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" +} +$langXlfFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf' + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" + $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$locFiles = $jsonFiles + $xlfFiles + +$locJson = @{ + Projects = @( + @{ + LanguageSet = $LanguageSet + LocItems = @( + $locFiles | ForEach-Object { + $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($outputPath.Contains($exclusion)) + { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { + Remove-Item -Path $sourceFile + } + if ($continue) + { + if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" + } + } + else { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnName" + OutputPath = $outputPath + } + } + } + } + ) + } + ) +} + +$json = ConvertTo-Json $locJson -Depth 5 +Write-Host "LocProject.json generated:`n`n$json`n`n" +Pop-Location + +if (!$UseCheckedInLocProjectJson) { + New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject.json" $json +} +else { + New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json + + if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." + + exit 1 + } + else { + Write-Host "Generated LocProject.json and current LocProject.json are identical." + } +} \ No newline at end of file diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml new file mode 100644 index 000000000..b27d6faf3 --- /dev/null +++ b/eng/common/templates/job/onelocbuild.yml @@ -0,0 +1,83 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: + vmImage: vs2017-win2016 + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + UseCheckedInLocProjectJson: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + condition: '' + +jobs: +- job: OneLocBuild + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild + + pool: ${{ parameters.pool }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + + + steps: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index 33c984f8f..edebab60f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21262.2" } } From 7f54d010259de80972e25a35e46be8fdb45439a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 17:02:16 +0000 Subject: [PATCH 084/118] Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10871) [release/5.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 9 -- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 5 -- eng/common/SetupNugetSources.sh | 14 --- eng/common/generate-locproject.ps1 | 110 +++++++++++++++++++++++ eng/common/templates/job/onelocbuild.yml | 83 +++++++++++++++++ global.json | 2 +- 8 files changed, 199 insertions(+), 34 deletions(-) create mode 100644 eng/common/generate-locproject.ps1 create mode 100644 eng/common/templates/job/onelocbuild.yml diff --git a/NuGet.config b/NuGet.config index 64d79b4b4..daf02ec43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -36,18 +31,14 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fca76c552..8693dec47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -148,13 +148,13 @@ - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 66dd8ac34..e84403f82 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21160.3 + 5.0.0-beta.21262.2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a6d188f1f..a0b5fc37f 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -158,9 +158,4 @@ if ($dotnet5Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } -$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") -if ($dotnetToolsSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password -} - $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 81d7913e6..2734601c1 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,20 +129,6 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet5-internal-transport') fi -# Ensure dotnet-tools-internal is in the packageSources if the public dotnet-tools feed is present -grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet-tools-internal') -fi - # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 new file mode 100644 index 000000000..2907f916d --- /dev/null +++ b/eng/common/generate-locproject.ps1 @@ -0,0 +1,110 @@ +Param( + [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here + [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json + [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one + [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally +) + +# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: +# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task + +Set-StrictMode -Version 2.0 +$ErrorActionPreference = "Stop" +. $PSScriptRoot\tools.ps1 + +Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') + +$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusions = @{ Exclusions = @() } +if (Test-Path -Path $exclusionsFilePath) +{ + $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json +} + +Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work + +# Template files +$jsonFiles = @() +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern + +$xlfFiles = @() + +$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" +$langXlfFiles = @() +if ($allXlfFiles) { + $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' + $firstLangCode = $Matches.1 + $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" +} +$langXlfFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf' + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" + $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$locFiles = $jsonFiles + $xlfFiles + +$locJson = @{ + Projects = @( + @{ + LanguageSet = $LanguageSet + LocItems = @( + $locFiles | ForEach-Object { + $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($outputPath.Contains($exclusion)) + { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { + Remove-Item -Path $sourceFile + } + if ($continue) + { + if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" + } + } + else { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnName" + OutputPath = $outputPath + } + } + } + } + ) + } + ) +} + +$json = ConvertTo-Json $locJson -Depth 5 +Write-Host "LocProject.json generated:`n`n$json`n`n" +Pop-Location + +if (!$UseCheckedInLocProjectJson) { + New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject.json" $json +} +else { + New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json + + if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." + + exit 1 + } + else { + Write-Host "Generated LocProject.json and current LocProject.json are identical." + } +} \ No newline at end of file diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml new file mode 100644 index 000000000..b27d6faf3 --- /dev/null +++ b/eng/common/templates/job/onelocbuild.yml @@ -0,0 +1,83 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: + vmImage: vs2017-win2016 + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + UseCheckedInLocProjectJson: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + condition: '' + +jobs: +- job: OneLocBuild + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild + + pool: ${{ parameters.pool }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + + + steps: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index 33c984f8f..edebab60f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21262.2" } } From c3e0fa6d7b0e148b4c4f73015a88c83636d7da03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 17:11:43 +0000 Subject: [PATCH 085/118] Update dependencies from https://github.com/dotnet/arcade build 20210512.2 (#10872) [release/5.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 24 ----- eng/Version.Details.xml | 8 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 5 -- eng/common/SetupNugetSources.sh | 14 --- eng/common/generate-locproject.ps1 | 110 +++++++++++++++++++++++ eng/common/templates/job/onelocbuild.yml | 83 +++++++++++++++++ global.json | 2 +- 8 files changed, 199 insertions(+), 49 deletions(-) create mode 100644 eng/common/generate-locproject.ps1 create mode 100644 eng/common/templates/job/onelocbuild.yml diff --git a/NuGet.config b/NuGet.config index ce028f67b..315197afb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,15 @@ - - - - - - - - - - - - @@ -44,23 +32,11 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee245dd20..978f05eaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -144,13 +144,13 @@ - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f - + https://github.com/dotnet/arcade - 670382be6a978ba401c21c57ba44311199d2682a + dad4f3c62e24b94b1514427674af8ca899cddd5f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 44481b15f..fe0d74bf3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 5.0.0-beta.21160.3 + 5.0.0-beta.21262.2 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index a6d188f1f..a0b5fc37f 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -158,9 +158,4 @@ if ($dotnet5Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } -$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") -if ($dotnetToolsSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password -} - $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 81d7913e6..2734601c1 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -129,20 +129,6 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet5-internal-transport') fi -# Ensure dotnet-tools-internal is in the packageSources if the public dotnet-tools feed is present -grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet-tools-internal') -fi - # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 new file mode 100644 index 000000000..2907f916d --- /dev/null +++ b/eng/common/generate-locproject.ps1 @@ -0,0 +1,110 @@ +Param( + [Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here + [string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json + [switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one + [switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally +) + +# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here: +# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task + +Set-StrictMode -Version 2.0 +$ErrorActionPreference = "Stop" +. $PSScriptRoot\tools.ps1 + +Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1') + +$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json" +$exclusions = @{ Exclusions = @() } +if (Test-Path -Path $exclusionsFilePath) +{ + $exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json +} + +Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work + +# Template files +$jsonFiles = @() +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern +$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern + +$xlfFiles = @() + +$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf" +$langXlfFiles = @() +if ($allXlfFiles) { + $null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf' + $firstLangCode = $Matches.1 + $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf" +} +$langXlfFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf' + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf" + $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$locFiles = $jsonFiles + $xlfFiles + +$locJson = @{ + Projects = @( + @{ + LanguageSet = $LanguageSet + LocItems = @( + $locFiles | ForEach-Object { + $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($outputPath.Contains($exclusion)) + { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') { + Remove-Item -Path $sourceFile + } + if ($continue) + { + if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\" + } + } + else { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnName" + OutputPath = $outputPath + } + } + } + } + ) + } + ) +} + +$json = ConvertTo-Json $locJson -Depth 5 +Write-Host "LocProject.json generated:`n`n$json`n`n" +Pop-Location + +if (!$UseCheckedInLocProjectJson) { + New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject.json" $json +} +else { + New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created + Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json + + if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) { + Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them." + + exit 1 + } + else { + Write-Host "Generated LocProject.json and current LocProject.json are identical." + } +} \ No newline at end of file diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml new file mode 100644 index 000000000..b27d6faf3 --- /dev/null +++ b/eng/common/templates/job/onelocbuild.yml @@ -0,0 +1,83 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: + vmImage: vs2017-win2016 + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(Build.SourcesDirectory) + CreatePr: true + AutoCompletePr: false + UseCheckedInLocProjectJson: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + condition: '' + +jobs: +- job: OneLocBuild + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild + + pool: ${{ parameters.pool }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + + + steps: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/global.json b/global.json index 33c984f8f..edebab60f 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21160.3" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21262.2" } } From 96b93222f75bd010f1259b32d484cfca2ec914ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 11:00:15 +0000 Subject: [PATCH 086/118] Update dependencies from https://github.com/dotnet/sdk build 20210610.3 (#10879) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.11.0-preview-21305-01 to 16.11.0-preview-21308-05 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cbc7b8922..03044dfc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 59b5a4d9c3fe1d7e4f394acded1111429d609a78 + 08b1182488d6d556d28acc64f4a13a2a29cf008c - + https://github.com/dotnet/sdk - 59b5a4d9c3fe1d7e4f394acded1111429d609a78 + 08b1182488d6d556d28acc64f4a13a2a29cf008c @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 5b45a56b9b8258e18756ab3981a609fdccf0cb45 - + https://github.com/dotnet/msbuild - f1675f834b94baa4680ebfe4c2ee0327efa2285f + bf62538caa09827db081b4601da34249d7af0e2d https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 136fea7b7..28bc3e6ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21305.3 - 5.0.400-preview.21305.3 + 5.0.400-preview.21310.3 + 5.0.400-preview.21310.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5db6946a674bba6f4b16cce48cca7910edb945b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 16:26:32 +0000 Subject: [PATCH 087/118] Update dependencies from https://github.com/dotnet/sdk build 20210610.10 (#10880) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.11.0-preview-21308-05 to 16.11.0-preview-21309-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03044dfc7..971019d87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 08b1182488d6d556d28acc64f4a13a2a29cf008c + f6c8f5fed0f23b508f70016925a2a93a02b37a50 - + https://github.com/dotnet/sdk - 08b1182488d6d556d28acc64f4a13a2a29cf008c + f6c8f5fed0f23b508f70016925a2a93a02b37a50 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn 5b45a56b9b8258e18756ab3981a609fdccf0cb45 - + https://github.com/dotnet/msbuild - bf62538caa09827db081b4601da34249d7af0e2d + 8f0313c110257e0cbdc7970ad838e1b74b18a302 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 28bc3e6ee..9fa805a08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21310.3 - 5.0.400-preview.21310.3 + 5.0.400-preview.21310.10 + 5.0.400-preview.21310.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6352b644629124b6c78fd34babc91816518217a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Jun 2021 22:36:57 +0000 Subject: [PATCH 088/118] Update dependencies from https://github.com/dotnet/sdk build 20210610.17 (#10881) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.ILLink.Tasks: from 5.0.0-rtm.21221.2 to 5.0.0-rtm.21310.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 971019d87..d14d21d63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - f6c8f5fed0f23b508f70016925a2a93a02b37a50 + c9d99fafec064a746740f4561b8decf3058997db - + https://github.com/dotnet/sdk - f6c8f5fed0f23b508f70016925a2a93a02b37a50 + c9d99fafec064a746740f4561b8decf3058997db @@ -112,9 +112,9 @@ https://github.com/microsoft/vstest 9b8fac9e1dd2a1a1d7604ec38df6a8b1002c516e - + https://github.com/mono/linker - 6a15056a9d71169bf04d007301edfd558afcfa6a + e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker diff --git a/eng/Versions.props b/eng/Versions.props index 9fa805a08..dbfa564cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21310.10 - 5.0.400-preview.21310.10 + 5.0.400-preview.21310.17 + 5.0.400-preview.21310.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d273c6d195b5dfdda8bb0e2b88b67d505d0d9e63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Jun 2021 16:15:27 +0000 Subject: [PATCH 089/118] Update dependencies from https://github.com/dotnet/sdk build 20210611.6 (#10884) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21302.15 to 3.11.0-2.21310.17 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d14d21d63..0c828327a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - c9d99fafec064a746740f4561b8decf3058997db + 19e44184a24945feb5db5de26dd97f43428e3ed4 - + https://github.com/dotnet/sdk - c9d99fafec064a746740f4561b8decf3058997db + 19e44184a24945feb5db5de26dd97f43428e3ed4 @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - 5b45a56b9b8258e18756ab3981a609fdccf0cb45 + b701abe639bb6e0f586d201d42a301ca8dc711aa https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index dbfa564cd..74f230be6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21310.17 - 5.0.400-preview.21310.17 + 5.0.400-preview.21311.6 + 5.0.400-preview.21311.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ca7710905474110ae730876a152c3cbaabafacba Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 11 Jun 2021 10:58:45 -0700 Subject: [PATCH 090/118] Add Windows targeting information in new format, bump package versions, add 20348 as targetable version --- eng/ManualVersions.props | 7 ++++--- src/redist/targets/GenerateBundledVersions.targets | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index a9c76ddc8..5826e1bd4 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,8 +9,9 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.17 - 10.0.18362.17 - 10.0.19041.17 + 10.0.17763.18 + 10.0.18362.18 + 10.0.19041.18 + 10.0.20348.18 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1c05c7213..93c7b0d9d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -480,6 +480,15 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackName="NETStandard.Library.Ref" TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)" /> + + + + + + + + + ]]> From 39d41c1eb2fbe9634c2164cea22c17fd4124306e Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 11 Jun 2021 12:32:36 -0700 Subject: [PATCH 091/118] Revert to Windows SDK package versions that are currently published --- eng/ManualVersions.props | 6 +++--- test/EndToEnd/GivenWindows50App.cs | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 5826e1bd4..de3923ade 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,9 +9,9 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.18 - 10.0.18362.18 - 10.0.19041.18 + 10.0.17763.17 + 10.0.18362.17 + 10.0.19041.17 10.0.20348.18 diff --git a/test/EndToEnd/GivenWindows50App.cs b/test/EndToEnd/GivenWindows50App.cs index 51a814fe7..06ae6c147 100644 --- a/test/EndToEnd/GivenWindows50App.cs +++ b/test/EndToEnd/GivenWindows50App.cs @@ -16,6 +16,7 @@ namespace EndToEnd [InlineData("10.0.17763.0")] [InlineData("10.0.18362.0")] [InlineData("10.0.19041.0")] + [InlineData("10.0.20348.0", Skip = "Package not published yet")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From 222595ecf2526b797ccbb0642ad1d209f7fe9086 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 12 Jun 2021 15:34:25 +0000 Subject: [PATCH 092/118] Update dependencies from https://github.com/dotnet/sdk build 20210612.3 (#10890) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21310.17 to 3.11.0-2.21311.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c828327a..b3a26c26f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 19e44184a24945feb5db5de26dd97f43428e3ed4 + 8af173296023859efe3327f609b07f27d187cffb - + https://github.com/dotnet/sdk - 19e44184a24945feb5db5de26dd97f43428e3ed4 + 8af173296023859efe3327f609b07f27d187cffb @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - b701abe639bb6e0f586d201d42a301ca8dc711aa + d6c9ffdcd61d218bf8a12ca831dbcbb8c24fcade https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 74f230be6..a032005a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21311.6 - 5.0.400-preview.21311.6 + 5.0.400-preview.21312.3 + 5.0.400-preview.21312.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f580d5e9e91a110ab9882ec1033bbe0986ceba60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 18:33:27 +0000 Subject: [PATCH 093/118] Update dependencies from https://github.com/dotnet/sdk build 20210614.7 (#10894) [release/5.0.4xx] Update dependencies from dotnet/sdk --- 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 b3a26c26f..ab4f45533 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 8af173296023859efe3327f609b07f27d187cffb + 55814922394607841eb0d75870a1f987ace680cf - + https://github.com/dotnet/sdk - 8af173296023859efe3327f609b07f27d187cffb + 55814922394607841eb0d75870a1f987ace680cf diff --git a/eng/Versions.props b/eng/Versions.props index a032005a7..9bc03350c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21312.3 - 5.0.400-preview.21312.3 + 5.0.400-preview.21314.7 + 5.0.400-preview.21314.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From aae22b05c41b66edcde2da38c99049f1fb4c8352 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Jun 2021 13:24:27 -0700 Subject: [PATCH 094/118] Decrement 2.1 patch version To account for 2.1 not building this month --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 5a2fb8170..aa2691f11 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -24,7 +24,7 @@ - $([MSBuild]::Add($(VersionFeature), 27)) + $([MSBuild]::Add($(VersionFeature), 26)) $([MSBuild]::Add($(VersionFeature), 15)) From 9ad65fcd08e1a7e0969e87298ef1500e1af1e3e0 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 14 Jun 2021 14:31:26 -0700 Subject: [PATCH 095/118] Decrement 2.1 patch version (#10897) --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 1c05c7213..b86c228f1 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -24,7 +24,7 @@ - $([MSBuild]::Add($(VersionFeature), 24)) + $([MSBuild]::Add($(VersionFeature), 23)) $([MSBuild]::Add($(VersionFeature), 12)) From 0cc341a82a8c1670112b04c88325db140974ce59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Jun 2021 23:32:51 +0000 Subject: [PATCH 096/118] Update dependencies from https://github.com/dotnet/sdk build 20210616.8 (#10905) [release/5.0.4xx] Update dependencies from dotnet/sdk --- 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 ab4f45533..f084c8458 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 55814922394607841eb0d75870a1f987ace680cf + c2cab31e2c8490a34e92cafc0064d23fabcb1c93 - + https://github.com/dotnet/sdk - 55814922394607841eb0d75870a1f987ace680cf + c2cab31e2c8490a34e92cafc0064d23fabcb1c93 diff --git a/eng/Versions.props b/eng/Versions.props index 9bc03350c..2f32d716a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21314.7 - 5.0.400-preview.21314.7 + 5.0.400-preview.21316.8 + 5.0.400-preview.21316.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a22d1c0932f024d14b2e1dfa6eefd2d09aa9cbcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 00:37:32 +0000 Subject: [PATCH 097/118] [release/5.0.4xx] Update dependencies from dotnet/sdk (#10911) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 3.11.0-2.21311.1 to 3.11.0-2.21316.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f084c8458..33c840ca9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - c2cab31e2c8490a34e92cafc0064d23fabcb1c93 + 261bb45192e620c9b5eae2d4ed72bfdb07a3b279 - + https://github.com/dotnet/sdk - c2cab31e2c8490a34e92cafc0064d23fabcb1c93 + 261bb45192e620c9b5eae2d4ed72bfdb07a3b279 @@ -117,9 +117,9 @@ e6a47c70b7878b346ff0858085eb8a6379f6f0bb linker - + https://github.com/dotnet/roslyn - d6c9ffdcd61d218bf8a12ca831dbcbb8c24fcade + b0b49a859a7f7ba09aaf5388859ecb12d6d3e357 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 2f32d716a..b842ce4bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21316.8 - 5.0.400-preview.21316.8 + 5.0.400-preview.21317.18 + 5.0.400-preview.21317.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bdf6ad25b0ff094259d8a544d724a4c32ea9adec Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Thu, 17 Jun 2021 19:03:08 -0700 Subject: [PATCH 098/118] Update Windows SDK projection --- eng/ManualVersions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index de3923ade..5826e1bd4 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,9 +9,9 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.17 - 10.0.18362.17 - 10.0.19041.17 + 10.0.17763.18 + 10.0.18362.18 + 10.0.19041.18 10.0.20348.18 From 35404aed85a1c8dae1465a01d395ec618e8cb090 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 18:22:28 +0000 Subject: [PATCH 099/118] Update dependencies from https://github.com/dotnet/sdk build 20210617.28 (#10915) [release/5.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 16.11.0-preview-21309-01 to 16.11.0-preview-21317-10 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33c840ca9..b2b8d39e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,13 +87,13 @@ https://github.com/dotnet/templating e832de2ee744332d876b2d979e7bf838f082639a - + https://github.com/dotnet/sdk - 261bb45192e620c9b5eae2d4ed72bfdb07a3b279 + 406c3f8fc3652aaffc6bb53e27a20f0e1a515bb6 - + https://github.com/dotnet/sdk - 261bb45192e620c9b5eae2d4ed72bfdb07a3b279 + 406c3f8fc3652aaffc6bb53e27a20f0e1a515bb6 @@ -121,9 +121,9 @@ https://github.com/dotnet/roslyn b0b49a859a7f7ba09aaf5388859ecb12d6d3e357 - + https://github.com/dotnet/msbuild - 8f0313c110257e0cbdc7970ad838e1b74b18a302 + eb30e0569ba7029f23490fa70638f762537b1ce3 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index b842ce4bb..57956f09c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 5.0.400-preview.21317.18 - 5.0.400-preview.21317.18 + 5.0.400-preview.21317.28 + 5.0.400-preview.21317.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f1ebeb4ac2be37d4358aaff3ed23ff169012e51b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Jun 2021 19:56:21 +0000 Subject: [PATCH 100/118] [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk (#10904) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.6.21305.3 to 6.0.0-preview.6.21317.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.6.21305.3 to 6.0.0-preview.6.21317.5 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.6.21317.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.6.21317.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.6.21317.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.6.21317.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.6.21317.12 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 6.0.0-preview.6.21306.1 to 6.0.0-preview.6.21317.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.6.21317.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.6.21317.6 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.6.21317.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.6.21317.6 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.6.21317.6 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.6.21306.3 to 6.0.0-preview.6.21317.6 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.6.21304.3 to 6.0.100-preview.6.21317.5 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21305.3 to 6.0.0-preview.6.21317.5 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.6.21278.2 to 6.0.0-preview.6.21317.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21305.3 to 6.0.0-preview.6.21317.5 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.6.21305.2 to 6.0.0-preview.6.21317.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 11.4.2-beta.21262.7 to 11.4.2-beta.21310.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21304.2 to 6.0.100-preview.6.21314.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-1.21304.5 to 4.0.0-2.21317.30 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21304-01 to 17.0.0-preview-21317-14 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++--------- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a7f5f871..bc77b67d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,37 +1,37 @@ - + https://github.com/dotnet/windowsdesktop - 074d8b7e48017a9e582255910099a9430489f6f0 + 9d23eba2a0295fa530d510cfe45ce6982f461be1 - + https://github.com/dotnet/windowsdesktop - 074d8b7e48017a9e582255910099a9430489f6f0 + 9d23eba2a0295fa530d510cfe45ce6982f461be1 - + https://github.com/dotnet/windowsdesktop - 074d8b7e48017a9e582255910099a9430489f6f0 + 9d23eba2a0295fa530d510cfe45ce6982f461be1 - + https://github.com/dotnet/runtime - 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 + 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/runtime - 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 + 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/runtime - 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 + 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/runtime - 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 + 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/runtime - 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 + 8bb087d5f77f133d74797b91bb539ec0e2eb3910 @@ -39,33 +39,33 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 + 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/aspnetcore - 30e2d2265545c006c5feba3ebfdf39f7e2db3730 + 2c996cfadecdce526f0f8d73216a62ada7f8b14a - + https://github.com/dotnet/aspnetcore - 30e2d2265545c006c5feba3ebfdf39f7e2db3730 + 2c996cfadecdce526f0f8d73216a62ada7f8b14a - + https://github.com/dotnet/aspnetcore - 30e2d2265545c006c5feba3ebfdf39f7e2db3730 + 2c996cfadecdce526f0f8d73216a62ada7f8b14a - + https://github.com/dotnet/aspnetcore - 30e2d2265545c006c5feba3ebfdf39f7e2db3730 + 2c996cfadecdce526f0f8d73216a62ada7f8b14a - + https://github.com/dotnet/aspnetcore - 30e2d2265545c006c5feba3ebfdf39f7e2db3730 + 2c996cfadecdce526f0f8d73216a62ada7f8b14a - + https://github.com/dotnet/aspnetcore - 30e2d2265545c006c5feba3ebfdf39f7e2db3730 + 2c996cfadecdce526f0f8d73216a62ada7f8b14a https://github.com/dotnet/test-templates @@ -79,47 +79,47 @@ https://github.com/dotnet/test-templates 9c63237a55fba3c57492230a5ac24ede203dec5a - + https://github.com/dotnet/templating - 8375e4837abc2e38f5ea9dd5457c944a89467be3 + 162694539948d1c96dff94a0e6d6df9313fbca20 - + https://github.com/dotnet/sdk - e0edd9526bf6b584b5b35371bd9b0606fd457357 + c5244adcd1398b76fadad8425f8660272f5e3a8e - + https://github.com/dotnet/sdk - e0edd9526bf6b584b5b35371bd9b0606fd457357 + c5244adcd1398b76fadad8425f8660272f5e3a8e - + https://github.com/dotnet/winforms - 1320e330434e9912060f2b471561be02492d6021 + 2e42461f881f3e821a7290d6dafa0d5e32a93728 - + https://github.com/dotnet/wpf - 06d97b991bbbf595ba8a9e4b286b04f9e7b205a0 + 11854a18ebb516bc25e005642cd73fec4a8e8c96 - + https://github.com/dotnet/fsharp - 1b23bbeda88ea3cb9be9af777f4c99fa8663df81 + 70c1e5c3ac1e213e85831593fc65b7ca510cfae4 https://github.com/microsoft/vstest ad32654bc155a059fda263f0ec99b445058d84ea - + https://github.com/mono/linker - 21df7dbbf881507c98026c1b9e7532303b3c0a06 + f90f5c929054d4b4b69da0a21db4f69aa64d63af linker - + https://github.com/dotnet/roslyn - b6a9f8c39f7a71b02b9a8b929f002777e4efd6f1 + 76ddf2ccc828b863b4921de471eea84203871d52 - + https://github.com/dotnet/msbuild - a5ea6d2ca261920809260b43c7c1e1f05b41a958 + 4945f056cbb8ced1410511962c5b4c34f92023f6 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 66ddd32ab..4b7daaed1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,15 +24,15 @@ - 6.0.0-preview.6.21278.2 + 6.0.0-preview.6.21317.3 - 6.0.0-preview.6.21305.2 + 6.0.0-preview.6.21317.3 - 6.0.100-preview.6.21304.3 + 6.0.100-preview.6.21317.5 @@ -45,42 +45,42 @@ - 6.0.0-preview.6.21306.3 - 6.0.0-preview.6.21306.3 - 6.0.0-preview.6.21306.3 - 6.0.0-preview.6.21306.3 - 6.0.0-preview.6.21306.3 - 6.0.0-preview.6.21306.3 + 6.0.0-preview.6.21317.6 + 6.0.0-preview.6.21317.6 + 6.0.0-preview.6.21317.6 + 6.0.0-preview.6.21317.6 + 6.0.0-preview.6.21317.6 + 6.0.0-preview.6.21317.6 0.2.0 - 6.0.100-preview.6.21306.5 - 6.0.100-preview.6.21306.5 + 6.0.100-preview.6.21318.10 + 6.0.100-preview.6.21318.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21317.12 - 6.0.0-preview.6.21306.1 - 6.0.0-preview.6.21306.1 - 6.0.0-preview.6.21306.1 - 6.0.0-preview.6.21306.1 - 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21317.12 + 6.0.0-preview.6.21317.12 + 6.0.0-preview.6.21317.12 + 6.0.0-preview.6.21317.12 + 6.0.0-preview.6.21317.12 2.1.0 - 6.0.0-preview.6.21305.3 - 6.0.0-preview.6.21305.3 - 6.0.0-preview.6.21305.3 + 6.0.0-preview.6.21317.5 + 6.0.0-preview.6.21317.5 + 6.0.0-preview.6.21317.5 From 556cf1f0f3a8e5425a99091eaf1d568dde254142 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Fri, 18 Jun 2021 15:09:20 -0700 Subject: [PATCH 101/118] Fix call to DownloadFile --- src/redist/targets/GenerateLayout.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index ace59417e..e8d75b7ca 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -333,9 +333,13 @@ + + $([System.Environment]::GetEnvironmentVariable('DOTNETCLIMSRC_READ_SAS_TOKEN')) + + From e5f1798236f96f89b49df822ba5e62a2101b50b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Jun 2021 03:03:21 +0000 Subject: [PATCH 102/118] [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk (#10923) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.6.21317.6 to 6.0.0-preview.6.21318.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.6.21317.6 to 6.0.0-preview.6.21318.16 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21317.6 to 6.0.0-preview.6.21318.16 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21317.6 to 6.0.0-preview.6.21318.16 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.6.21317.6 to 6.0.0-preview.6.21318.16 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.6.21317.6 to 6.0.0-preview.6.21318.16 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc77b67d7..6a3c997dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/aspnetcore - 2c996cfadecdce526f0f8d73216a62ada7f8b14a + f895f93b673ae26cade2780cf0d59594641ebd77 - + https://github.com/dotnet/aspnetcore - 2c996cfadecdce526f0f8d73216a62ada7f8b14a + f895f93b673ae26cade2780cf0d59594641ebd77 - + https://github.com/dotnet/aspnetcore - 2c996cfadecdce526f0f8d73216a62ada7f8b14a + f895f93b673ae26cade2780cf0d59594641ebd77 - + https://github.com/dotnet/aspnetcore - 2c996cfadecdce526f0f8d73216a62ada7f8b14a + f895f93b673ae26cade2780cf0d59594641ebd77 - + https://github.com/dotnet/aspnetcore - 2c996cfadecdce526f0f8d73216a62ada7f8b14a + f895f93b673ae26cade2780cf0d59594641ebd77 - + https://github.com/dotnet/aspnetcore - 2c996cfadecdce526f0f8d73216a62ada7f8b14a + f895f93b673ae26cade2780cf0d59594641ebd77 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 162694539948d1c96dff94a0e6d6df9313fbca20 - + https://github.com/dotnet/sdk - c5244adcd1398b76fadad8425f8660272f5e3a8e + 909e4772e6b0beb2f92d3926f521709666729a6e - + https://github.com/dotnet/sdk - c5244adcd1398b76fadad8425f8660272f5e3a8e + 909e4772e6b0beb2f92d3926f521709666729a6e diff --git a/eng/Versions.props b/eng/Versions.props index 4b7daaed1..5eacbbef2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.6.21317.6 - 6.0.0-preview.6.21317.6 - 6.0.0-preview.6.21317.6 - 6.0.0-preview.6.21317.6 - 6.0.0-preview.6.21317.6 - 6.0.0-preview.6.21317.6 + 6.0.0-preview.6.21318.16 + 6.0.0-preview.6.21318.16 + 6.0.0-preview.6.21318.16 + 6.0.0-preview.6.21318.16 + 6.0.0-preview.6.21318.16 + 6.0.0-preview.6.21318.16 0.2.0 - 6.0.100-preview.6.21318.10 - 6.0.100-preview.6.21318.10 + 6.0.100-preview.6.21318.20 + 6.0.100-preview.6.21318.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 427b7299d27155311beaf0f0002025bbffbe3e13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Jun 2021 03:56:32 +0000 Subject: [PATCH 103/118] Update dependencies from https://github.com/dotnet/sdk build 20210618.22 (#10924) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21317.30 to 4.0.0-2.21318.10 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a3c997dc..09d55e7ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 162694539948d1c96dff94a0e6d6df9313fbca20 - + https://github.com/dotnet/sdk - 909e4772e6b0beb2f92d3926f521709666729a6e + 7fa653debd3cc94f93d2af0cbff4f9c8f885d753 - + https://github.com/dotnet/sdk - 909e4772e6b0beb2f92d3926f521709666729a6e + 7fa653debd3cc94f93d2af0cbff4f9c8f885d753 @@ -113,9 +113,9 @@ f90f5c929054d4b4b69da0a21db4f69aa64d63af linker - + https://github.com/dotnet/roslyn - 76ddf2ccc828b863b4921de471eea84203871d52 + e1d9cc3a3a6e4f66c013a89d94378f34f0587201 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 5eacbbef2..d6026601b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21318.20 - 6.0.100-preview.6.21318.20 + 6.0.100-preview.6.21318.22 + 6.0.100-preview.6.21318.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2646c11a01ba0e4f21bdc644944df34678ddf6e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Jun 2021 04:47:19 +0000 Subject: [PATCH 104/118] Update dependencies from https://github.com/dotnet/sdk build 20210618.24 (#10925) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.6.21318.16 to 6.0.0-preview.6.21318.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.6.21318.16 to 6.0.0-preview.6.21318.21 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21318.16 to 6.0.0-preview.6.21318.21 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21318.16 to 6.0.0-preview.6.21318.21 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.6.21318.16 to 6.0.0-preview.6.21318.21 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.6.21318.16 to 6.0.0-preview.6.21318.21 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09d55e7ed..c3af7a00a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/aspnetcore - f895f93b673ae26cade2780cf0d59594641ebd77 + 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 - + https://github.com/dotnet/aspnetcore - f895f93b673ae26cade2780cf0d59594641ebd77 + 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 - + https://github.com/dotnet/aspnetcore - f895f93b673ae26cade2780cf0d59594641ebd77 + 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 - + https://github.com/dotnet/aspnetcore - f895f93b673ae26cade2780cf0d59594641ebd77 + 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 - + https://github.com/dotnet/aspnetcore - f895f93b673ae26cade2780cf0d59594641ebd77 + 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 - + https://github.com/dotnet/aspnetcore - f895f93b673ae26cade2780cf0d59594641ebd77 + 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 162694539948d1c96dff94a0e6d6df9313fbca20 - + https://github.com/dotnet/sdk - 7fa653debd3cc94f93d2af0cbff4f9c8f885d753 + b28b583e1a925e64222893622547685811b74168 - + https://github.com/dotnet/sdk - 7fa653debd3cc94f93d2af0cbff4f9c8f885d753 + b28b583e1a925e64222893622547685811b74168 diff --git a/eng/Versions.props b/eng/Versions.props index d6026601b..8a6e0f500 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.6.21318.16 - 6.0.0-preview.6.21318.16 - 6.0.0-preview.6.21318.16 - 6.0.0-preview.6.21318.16 - 6.0.0-preview.6.21318.16 - 6.0.0-preview.6.21318.16 + 6.0.0-preview.6.21318.21 + 6.0.0-preview.6.21318.21 + 6.0.0-preview.6.21318.21 + 6.0.0-preview.6.21318.21 + 6.0.0-preview.6.21318.21 + 6.0.0-preview.6.21318.21 0.2.0 - 6.0.100-preview.6.21318.22 - 6.0.100-preview.6.21318.22 + 6.0.100-preview.6.21318.24 + 6.0.100-preview.6.21318.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a1c3ca9b318c92f7b996edb291d6d09618a01c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Jun 2021 05:32:56 +0000 Subject: [PATCH 105/118] Update dependencies from https://github.com/dotnet/sdk build 20210618.26 (#10926) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21318.10 to 4.0.0-2.21318.12 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3af7a00a..bad766d49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 162694539948d1c96dff94a0e6d6df9313fbca20 - + https://github.com/dotnet/sdk - b28b583e1a925e64222893622547685811b74168 + 7c9655024582452fb4bbffc273a58da5f92e0079 - + https://github.com/dotnet/sdk - b28b583e1a925e64222893622547685811b74168 + 7c9655024582452fb4bbffc273a58da5f92e0079 @@ -113,9 +113,9 @@ f90f5c929054d4b4b69da0a21db4f69aa64d63af linker - + https://github.com/dotnet/roslyn - e1d9cc3a3a6e4f66c013a89d94378f34f0587201 + 934166cc04b204cc0d5044f4cc5d7bf5b792518c https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 8a6e0f500..568638784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21318.24 - 6.0.100-preview.6.21318.24 + 6.0.100-preview.6.21318.26 + 6.0.100-preview.6.21318.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f6c62c37589b3f34a780fa4cb8813a28955c7ab5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 19 Jun 2021 09:42:53 +0000 Subject: [PATCH 106/118] [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk (#10927) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-preview.6.21317.5 to 6.0.100-preview.6.21318.7 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 11.4.2-beta.21310.3 to 12.0.0-beta.21318.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21318.12 to 4.0.0-2.21318.13 (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 bad766d49..4df37ca02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,17 +79,17 @@ https://github.com/dotnet/test-templates 9c63237a55fba3c57492230a5ac24ede203dec5a - + https://github.com/dotnet/templating - 162694539948d1c96dff94a0e6d6df9313fbca20 + 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - 7c9655024582452fb4bbffc273a58da5f92e0079 + ac9e999f09d6337264f54a0728e0816eaa158051 - + https://github.com/dotnet/sdk - 7c9655024582452fb4bbffc273a58da5f92e0079 + ac9e999f09d6337264f54a0728e0816eaa158051 @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 11854a18ebb516bc25e005642cd73fec4a8e8c96 - + https://github.com/dotnet/fsharp - 70c1e5c3ac1e213e85831593fc65b7ca510cfae4 + a6319b41d8a5cb82adb0351e70f2171fca64a4aa https://github.com/microsoft/vstest @@ -113,9 +113,9 @@ f90f5c929054d4b4b69da0a21db4f69aa64d63af linker - + https://github.com/dotnet/roslyn - 934166cc04b204cc0d5044f4cc5d7bf5b792518c + ead5ec894c9aaac2e1396534f5a44e56e44a11f8 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 568638784..90ce7e03b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 6.0.100-preview.6.21317.5 + 6.0.100-preview.6.21318.7 @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21318.26 - 6.0.100-preview.6.21318.26 + 6.0.100-preview.6.21319.4 + 6.0.100-preview.6.21319.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8b3bb2197079a30aa269e2b8101243b27259137 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 06:34:20 +0000 Subject: [PATCH 107/118] Update dependencies from https://github.com/dotnet/sdk build 20210620.5 (#10931) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk --- 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 4df37ca02..931e0ba2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - ac9e999f09d6337264f54a0728e0816eaa158051 + 41617f66a926586538b77fcd9c689112e5771027 - + https://github.com/dotnet/sdk - ac9e999f09d6337264f54a0728e0816eaa158051 + 41617f66a926586538b77fcd9c689112e5771027 diff --git a/eng/Versions.props b/eng/Versions.props index 90ce7e03b..f586ad2f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21319.4 - 6.0.100-preview.6.21319.4 + 6.0.100-preview.6.21320.5 + 6.0.100-preview.6.21320.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 897827a44331d83e31d73d98235b42c577c4ba50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 17:33:56 +0000 Subject: [PATCH 108/118] [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk (#10932) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21318.13 to 4.0.0-2.21320.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21317-14 to 17.0.0-preview-21318-03 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 931e0ba2a..c51abb589 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - 41617f66a926586538b77fcd9c689112e5771027 + cea7d8003ace59704569f7d861cda3109b920ec8 - + https://github.com/dotnet/sdk - 41617f66a926586538b77fcd9c689112e5771027 + cea7d8003ace59704569f7d861cda3109b920ec8 @@ -113,13 +113,13 @@ f90f5c929054d4b4b69da0a21db4f69aa64d63af linker - + https://github.com/dotnet/roslyn - ead5ec894c9aaac2e1396534f5a44e56e44a11f8 + acc39bc99b84648f84d8775519a858a63dd739be - + https://github.com/dotnet/msbuild - 4945f056cbb8ced1410511962c5b4c34f92023f6 + 2c37803a9286d4fdc3d57813e1fdbfe2cfdbf668 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index f586ad2f5..264d79c2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21320.5 - 6.0.100-preview.6.21320.5 + 6.0.100-preview.6.21321.2 + 6.0.100-preview.6.21321.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 57982aa2a460feef998d0c0c4e1fc446c5d50ca7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 00:09:31 +0000 Subject: [PATCH 109/118] Update dependencies from https://github.com/dotnet/sdk build 20210621.8 (#10939) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk --- 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 c51abb589..0e8a886bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - cea7d8003ace59704569f7d861cda3109b920ec8 + 093e34c6454dad7a957d6e91faa51825a1ab24e7 - + https://github.com/dotnet/sdk - cea7d8003ace59704569f7d861cda3109b920ec8 + 093e34c6454dad7a957d6e91faa51825a1ab24e7 diff --git a/eng/Versions.props b/eng/Versions.props index 264d79c2a..70c774555 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21321.2 - 6.0.100-preview.6.21321.2 + 6.0.100-preview.6.21321.8 + 6.0.100-preview.6.21321.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c026501c783895f277148f810583ca6e9919943f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 06:50:29 +0000 Subject: [PATCH 110/118] Update dependencies from https://github.com/dotnet/sdk build 20210621.14 (#10942) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.0-beta.21318.2 to 12.0.0-beta.21321.4 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e8a886bc..6ed274bde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - 093e34c6454dad7a957d6e91faa51825a1ab24e7 + 340881602eca87b5a163edfcc29f0818cb17782e - + https://github.com/dotnet/sdk - 093e34c6454dad7a957d6e91faa51825a1ab24e7 + 340881602eca87b5a163edfcc29f0818cb17782e @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 11854a18ebb516bc25e005642cd73fec4a8e8c96 - + https://github.com/dotnet/fsharp - a6319b41d8a5cb82adb0351e70f2171fca64a4aa + 13a21d4b08baa0e6b831cc2a7af872aeef8c22a5 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 70c774555..eea3feedc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21321.8 - 6.0.100-preview.6.21321.8 + 6.0.100-preview.6.21321.14 + 6.0.100-preview.6.21321.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 66e7c4cf3b8b98c03cab250999b00d330d8c786b Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 22 Jun 2021 12:25:10 -0700 Subject: [PATCH 111/118] Modify GenerateLayout to work with runtime configs that contain more than one runtime (#10901) (#10947) --- src/core-sdk-tasks/UpdateRuntimeConfig.cs | 70 ++++++++++++++++++++ src/redist/targets/BuildCoreSdkTasks.targets | 3 +- src/redist/targets/GenerateLayout.targets | 25 ++----- 3 files changed, 77 insertions(+), 21 deletions(-) create mode 100644 src/core-sdk-tasks/UpdateRuntimeConfig.cs diff --git a/src/core-sdk-tasks/UpdateRuntimeConfig.cs b/src/core-sdk-tasks/UpdateRuntimeConfig.cs new file mode 100644 index 000000000..8d8c73c63 --- /dev/null +++ b/src/core-sdk-tasks/UpdateRuntimeConfig.cs @@ -0,0 +1,70 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Newtonsoft.Json.Linq; + +namespace Microsoft.DotNet.Build.Tasks +{ + public sealed class UpdateRuntimeConfig : Task + { + [Required] + public ITaskItem[] RuntimeConfigPaths { get; set; } + + [Required] + public string MicrosoftNetCoreAppVersion { get; set; } + + [Required] + public string MicrosoftAspNetCoreAppVersion { get; set; } + + public override bool Execute() + { + foreach (var file in RuntimeConfigPaths) + { + UpdateFile(file.ItemSpec); + } + + return true; + } + + private void UpdateFile(string file) + { + var text = File.ReadAllText(file); + JObject config = JObject.Parse(text); + var frameworks = config["runtimeOptions"]?["frameworks"]; + var framework = config["runtimeOptions"]?["framework"]; + if (frameworks != null) + { + foreach (var item in frameworks) + { + UpdateFramework(item); + } + } + else if (framework != null) + { + UpdateFramework(framework); + } + + File.WriteAllText(file, config.ToString()); + } + + private void UpdateFramework(JToken item) + { + var framework = (JObject)item; + var name = framework["name"].Value(); + if (name == "Microsoft.NETCore.App") + { + framework["version"] = MicrosoftNetCoreAppVersion; + } + else if (name == "Microsoft.AspNetCore.App") + { + framework["version"] = MicrosoftAspNetCoreAppVersion; + } + } + } +} \ No newline at end of file diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index d7692cebc..c87b22094 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -3,7 +3,7 @@ $(CoreSdkTargetFramework) net472 - + $(ArtifactsDir)tasks\bin\core-sdk-tasks\$(Configuration)\$(TaskTargetFramework)\core-sdk-tasks.dll $(RepoRoot)src\core-sdk-tasks\core-sdk-tasks.csproj @@ -27,6 +27,7 @@ + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index e8d75b7ca..a83f6fddd 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -407,30 +407,15 @@ - - "version": ".*" - "version": "$(MicrosoftNETCoreAppRuntimePackageVersion)" - "version": "$(MicrosoftAspNetCoreAppRuntimePackageVersion)" - - - - - - + + Date: Tue, 22 Jun 2021 13:19:03 -0700 Subject: [PATCH 112/118] Update GenerateBundledVersions.targets --- src/redist/targets/GenerateBundledVersions.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 17e18e9cc..0fed60055 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -41,7 +41,7 @@ <_NET50RuntimePackVersion>5.0.7 <_NET50TargetingPackVersion>5.0.0 - <_WindowsDesktop50RuntimePackVersion>5.0.5 + <_WindowsDesktop50RuntimePackVersion>5.0.7 <_WindowsDesktop50TargetingPackVersion>5.0.0 <_AspNet50RuntimePackVersion>5.0.7 <_AspNet50TargetingPackVersion>5.0.0 @@ -55,7 +55,7 @@ <_WindowsDesktop30RuntimePackVersion>3.0.3 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_WindowsDesktop31RuntimePackVersion>3.1.14 + <_WindowsDesktop31RuntimePackVersion>3.1.16 <_WindowsDesktop31TargetingPackVersion>3.1.0 <_AspNet30RuntimePackVersion>3.0.3 From dae6e52f09abe9f4726938fb5445c9732ffcc5c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 20:49:03 +0000 Subject: [PATCH 113/118] Update dependencies from https://github.com/dotnet/sdk build 20210622.2 (#10944) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21320.2 to 4.0.0-2.21321.3 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ed274bde..6539f2673 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - 340881602eca87b5a163edfcc29f0818cb17782e + 64fd32a566d41f47cebec700cc778a3e4ed5c18f - + https://github.com/dotnet/sdk - 340881602eca87b5a163edfcc29f0818cb17782e + 64fd32a566d41f47cebec700cc778a3e4ed5c18f @@ -113,9 +113,9 @@ f90f5c929054d4b4b69da0a21db4f69aa64d63af linker - + https://github.com/dotnet/roslyn - acc39bc99b84648f84d8775519a858a63dd739be + 707ed8045df07669ce859ac4c748f48cf0a491ae https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index eea3feedc..2555081cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21321.14 - 6.0.100-preview.6.21321.14 + 6.0.100-preview.6.21322.2 + 6.0.100-preview.6.21322.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cea112a7226480676aeb725fad9b7faf6ae70ac2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 22:45:00 +0000 Subject: [PATCH 114/118] [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk (#10952) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.6.21318.21 to 6.0.0-preview.6.21322.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.6.21318.21 to 6.0.0-preview.6.21322.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21318.21 to 6.0.0-preview.6.21322.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21318.21 to 6.0.0-preview.6.21322.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.6.21318.21 to 6.0.0-preview.6.21322.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.6.21318.21 to 6.0.0-preview.6.21322.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6539f2673..c8157f20a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/aspnetcore - 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 + c4e8af6f19a5e67031680b6d52eea2e12a582562 - + https://github.com/dotnet/aspnetcore - 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 + c4e8af6f19a5e67031680b6d52eea2e12a582562 - + https://github.com/dotnet/aspnetcore - 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 + c4e8af6f19a5e67031680b6d52eea2e12a582562 - + https://github.com/dotnet/aspnetcore - 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 + c4e8af6f19a5e67031680b6d52eea2e12a582562 - + https://github.com/dotnet/aspnetcore - 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 + c4e8af6f19a5e67031680b6d52eea2e12a582562 - + https://github.com/dotnet/aspnetcore - 4fb1d855cd134b63ba8030649157bc8baf6aa2f5 + c4e8af6f19a5e67031680b6d52eea2e12a582562 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - 64fd32a566d41f47cebec700cc778a3e4ed5c18f + b80b435fda5aaceeab6067e5270a656267b4e17c - + https://github.com/dotnet/sdk - 64fd32a566d41f47cebec700cc778a3e4ed5c18f + b80b435fda5aaceeab6067e5270a656267b4e17c diff --git a/eng/Versions.props b/eng/Versions.props index 2555081cd..3f63a1411 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.6.21318.21 - 6.0.0-preview.6.21318.21 - 6.0.0-preview.6.21318.21 - 6.0.0-preview.6.21318.21 - 6.0.0-preview.6.21318.21 - 6.0.0-preview.6.21318.21 + 6.0.0-preview.6.21322.2 + 6.0.0-preview.6.21322.2 + 6.0.0-preview.6.21322.2 + 6.0.0-preview.6.21322.2 + 6.0.0-preview.6.21322.2 + 6.0.0-preview.6.21322.2 0.2.0 - 6.0.100-preview.6.21322.2 - 6.0.100-preview.6.21322.2 + 6.0.100-preview.6.21322.12 + 6.0.100-preview.6.21322.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 426e40bbd7b270fb8e30ea38194c4ab23fb567e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 23:45:49 +0000 Subject: [PATCH 115/118] Update dependencies from https://github.com/dotnet/sdk build 20210622.13 (#10953) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.6.21317.5 to 6.0.0-preview.6.21322.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.6.21317.5 to 6.0.0-preview.6.21322.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21317.5 to 6.0.0-preview.6.21322.1 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.6.21317.3 to 6.0.0-preview.6.21318.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21317.5 to 6.0.0-preview.6.21322.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.6.21317.3 to 6.0.0-preview.6.21322.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8157f20a..533ce78cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 9d23eba2a0295fa530d510cfe45ce6982f461be1 + 4927b7fafc023b13fd7db9e91c3be188d5e3e0b7 - + https://github.com/dotnet/windowsdesktop - 9d23eba2a0295fa530d510cfe45ce6982f461be1 + 4927b7fafc023b13fd7db9e91c3be188d5e3e0b7 - + https://github.com/dotnet/windowsdesktop - 9d23eba2a0295fa530d510cfe45ce6982f461be1 + 4927b7fafc023b13fd7db9e91c3be188d5e3e0b7 https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - b80b435fda5aaceeab6067e5270a656267b4e17c + 15c70cf9d717179af0f1a5f1f670b2ae0229e54b - + https://github.com/dotnet/sdk - b80b435fda5aaceeab6067e5270a656267b4e17c + 15c70cf9d717179af0f1a5f1f670b2ae0229e54b - + https://github.com/dotnet/winforms - 2e42461f881f3e821a7290d6dafa0d5e32a93728 + ce7170424b8e46ca2941c82a259fd7edced0ebcb - + https://github.com/dotnet/wpf - 11854a18ebb516bc25e005642cd73fec4a8e8c96 + 5bee0ffd87db19c41c1d0033b72f7f925aa12d9a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3f63a1411..e7d7c07e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ - 6.0.0-preview.6.21317.3 + 6.0.0-preview.6.21318.6 - 6.0.0-preview.6.21317.3 + 6.0.0-preview.6.21322.1 @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21322.12 - 6.0.100-preview.6.21322.12 + 6.0.100-preview.6.21322.13 + 6.0.100-preview.6.21322.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.6.21317.5 - 6.0.0-preview.6.21317.5 - 6.0.0-preview.6.21317.5 + 6.0.0-preview.6.21322.1 + 6.0.0-preview.6.21322.1 + 6.0.0-preview.6.21322.1 From bf9492050c1d904e09290095ef56e5b77e1eaeb3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 01:52:19 +0000 Subject: [PATCH 116/118] Update dependencies from https://github.com/dotnet/sdk build 20210622.17 (#10955) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.AspNetCore.App.Ref: from 6.0.0-preview.6.21322.2 to 6.0.0-preview.6.21322.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-preview.6.21322.2 to 6.0.0-preview.6.21322.10 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21322.2 to 6.0.0-preview.6.21322.10 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-preview.6.21322.2 to 6.0.0-preview.6.21322.10 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.0-preview.6.21322.2 to 6.0.0-preview.6.21322.10 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.0-preview.6.21322.2 to 6.0.0-preview.6.21322.10 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.0.0-preview-21318-03 to 17.0.0-preview-21322-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 533ce78cc..94b100249 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime 8bb087d5f77f133d74797b91bb539ec0e2eb3910 - + https://github.com/dotnet/aspnetcore - c4e8af6f19a5e67031680b6d52eea2e12a582562 + a200a4c5f85da28edd7588fb646ffb4b61edbd88 - + https://github.com/dotnet/aspnetcore - c4e8af6f19a5e67031680b6d52eea2e12a582562 + a200a4c5f85da28edd7588fb646ffb4b61edbd88 - + https://github.com/dotnet/aspnetcore - c4e8af6f19a5e67031680b6d52eea2e12a582562 + a200a4c5f85da28edd7588fb646ffb4b61edbd88 - + https://github.com/dotnet/aspnetcore - c4e8af6f19a5e67031680b6d52eea2e12a582562 + a200a4c5f85da28edd7588fb646ffb4b61edbd88 - + https://github.com/dotnet/aspnetcore - c4e8af6f19a5e67031680b6d52eea2e12a582562 + a200a4c5f85da28edd7588fb646ffb4b61edbd88 - + https://github.com/dotnet/aspnetcore - c4e8af6f19a5e67031680b6d52eea2e12a582562 + a200a4c5f85da28edd7588fb646ffb4b61edbd88 https://github.com/dotnet/test-templates @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - 15c70cf9d717179af0f1a5f1f670b2ae0229e54b + 96dfbe199c2427400302a72a60c910fc6dbce738 - + https://github.com/dotnet/sdk - 15c70cf9d717179af0f1a5f1f670b2ae0229e54b + 96dfbe199c2427400302a72a60c910fc6dbce738 @@ -117,9 +117,9 @@ https://github.com/dotnet/roslyn 707ed8045df07669ce859ac4c748f48cf0a491ae - + https://github.com/dotnet/msbuild - 2c37803a9286d4fdc3d57813e1fdbfe2cfdbf668 + 52c41519f09a530db49dc62a955706f6d26f7e68 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index e7d7c07e5..6b8eecd8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,20 +45,20 @@ - 6.0.0-preview.6.21322.2 - 6.0.0-preview.6.21322.2 - 6.0.0-preview.6.21322.2 - 6.0.0-preview.6.21322.2 - 6.0.0-preview.6.21322.2 - 6.0.0-preview.6.21322.2 + 6.0.0-preview.6.21322.10 + 6.0.0-preview.6.21322.10 + 6.0.0-preview.6.21322.10 + 6.0.0-preview.6.21322.10 + 6.0.0-preview.6.21322.10 + 6.0.0-preview.6.21322.10 0.2.0 - 6.0.100-preview.6.21322.13 - 6.0.100-preview.6.21322.13 + 6.0.100-preview.6.21322.17 + 6.0.100-preview.6.21322.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 12636f6fdf5aa015bc0a1183936e5458f9ae85e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 07:53:58 +0000 Subject: [PATCH 117/118] Update dependencies from https://github.com/dotnet/sdk build 20210622.18 (#10956) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.6.21322.1 to 6.0.0-preview.6.21322.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.6.21322.1 to 6.0.0-preview.6.21322.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21322.1 to 6.0.0-preview.6.21322.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21322.1 to 6.0.0-preview.6.21322.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.6.21322.1 to 6.0.0-preview.6.21322.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94b100249..ca0ea6f65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 4927b7fafc023b13fd7db9e91c3be188d5e3e0b7 + 30eddce2e41f85b8865528d423fc312eb7a8bb1f - + https://github.com/dotnet/windowsdesktop - 4927b7fafc023b13fd7db9e91c3be188d5e3e0b7 + 30eddce2e41f85b8865528d423fc312eb7a8bb1f - + https://github.com/dotnet/windowsdesktop - 4927b7fafc023b13fd7db9e91c3be188d5e3e0b7 + 30eddce2e41f85b8865528d423fc312eb7a8bb1f https://github.com/dotnet/runtime @@ -83,22 +83,22 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - 96dfbe199c2427400302a72a60c910fc6dbce738 + afb7651a809a782c9deb58d3cbea6e5608bd89c8 - + https://github.com/dotnet/sdk - 96dfbe199c2427400302a72a60c910fc6dbce738 + afb7651a809a782c9deb58d3cbea6e5608bd89c8 https://github.com/dotnet/winforms ce7170424b8e46ca2941c82a259fd7edced0ebcb - + https://github.com/dotnet/wpf - 5bee0ffd87db19c41c1d0033b72f7f925aa12d9a + 5eea920d9de10fd4dccdf4748d511a7dd334042c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6b8eecd8a..dc174112a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ - 6.0.0-preview.6.21322.1 + 6.0.0-preview.6.21322.4 @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21322.17 - 6.0.100-preview.6.21322.17 + 6.0.100-preview.6.21322.18 + 6.0.100-preview.6.21322.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,9 +78,9 @@ - 6.0.0-preview.6.21322.1 - 6.0.0-preview.6.21322.1 - 6.0.0-preview.6.21322.1 + 6.0.0-preview.6.21322.4 + 6.0.0-preview.6.21322.4 + 6.0.0-preview.6.21322.4 From a8e1e79b8d41e94f8120d76d8ef206d46f600cf0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 23 Jun 2021 12:16:49 +0000 Subject: [PATCH 118/118] Update dependencies from https://github.com/dotnet/sdk build 20210623.3 (#10957) [release/6.0.1xx-preview6] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.0.0-beta.21321.4 to 12.0.0-beta.21322.7 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.0.0-2.21321.3 to 4.0.0-2.21322.50 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca0ea6f65..8bcd2fc6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating 8615f76c05d26cfd415d2ef251cc471fe60e4793 - + https://github.com/dotnet/sdk - afb7651a809a782c9deb58d3cbea6e5608bd89c8 + fe786f94d4fd4535fb2e32a25fb46f944e760120 - + https://github.com/dotnet/sdk - afb7651a809a782c9deb58d3cbea6e5608bd89c8 + fe786f94d4fd4535fb2e32a25fb46f944e760120 @@ -100,9 +100,9 @@ https://github.com/dotnet/wpf 5eea920d9de10fd4dccdf4748d511a7dd334042c - + https://github.com/dotnet/fsharp - 13a21d4b08baa0e6b831cc2a7af872aeef8c22a5 + 334fb20360e5aac33c1ba7ab21693186fc2350a6 https://github.com/microsoft/vstest @@ -113,9 +113,9 @@ f90f5c929054d4b4b69da0a21db4f69aa64d63af linker - + https://github.com/dotnet/roslyn - 707ed8045df07669ce859ac4c748f48cf0a491ae + ddb105d51cee1d1a826293ef47250def8cfb8766 https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index dc174112a..948560400 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ - 6.0.100-preview.6.21322.18 - 6.0.100-preview.6.21322.18 + 6.0.100-preview.6.21323.3 + 6.0.100-preview.6.21323.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)