From f01e2c69bfb4f86a713b23953395838439a20eff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 02:56:02 +0000 Subject: [PATCH 01/34] Update dependencies from https://github.com/dotnet/aspnetcore build 20200306.4 (#6718) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.2.20156.4 - dotnet-watch - 5.0.0-preview.2.20156.4 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.2.20156.4 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.2.20156.4 - dotnet-user-secrets - 5.0.0-preview.2.20156.4 - dotnet-dev-certs - 5.0.0-preview.2.20156.4 Co-authored-by: dotnet-maestro[bot] --- 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 347c7c73f..a42dc36ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime e2881ae96bb4399864723aa46469c82379b03b32 - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 850240804c9bbf949c6e7d0ff5593153f4801648 - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 850240804c9bbf949c6e7d0ff5593153f4801648 - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 850240804c9bbf949c6e7d0ff5593153f4801648 - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 850240804c9bbf949c6e7d0ff5593153f4801648 - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 850240804c9bbf949c6e7d0ff5593153f4801648 - + https://github.com/dotnet/aspnetcore - 118ff3c40b2aae9e414011d4d4496b77b3f83021 + 850240804c9bbf949c6e7d0ff5593153f4801648 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d23443036..3427d593c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 + 5.0.0-preview.2.20156.4 + 5.0.0-preview.2.20156.4 + 5.0.0-preview.2.20156.4 + 5.0.0-preview.2.20156.4 + 5.0.0-preview.2.20156.4 + 5.0.0-preview.2.20156.4 0.2.0 From 85cce760ab8ad572b2ad0ae84c99889500e8f71c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 03:11:40 +0000 Subject: [PATCH 02/34] Update dependencies from https://github.com/dotnet/sdk build 20200306.4 (#6719) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20156.4 - Microsoft.NET.Sdk - 5.0.100-preview.2.20156.4 Co-authored-by: dotnet-maestro[bot] --- 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 a42dc36ec..28255ca88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 93cc90f8d2b078a699888ade16f82060131798e8 + 4cbe9e2cfe869010e81341957956ed626ea752fd - + https://github.com/dotnet/sdk - 93cc90f8d2b078a699888ade16f82060131798e8 + 4cbe9e2cfe869010e81341957956ed626ea752fd diff --git a/eng/Versions.props b/eng/Versions.props index 3427d593c..23a4e847e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20156.1 - 5.0.100-preview.2.20156.1 + 5.0.100-preview.2.20156.4 + 5.0.100-preview.2.20156.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33c4e7f9927de78e54c8826ba196f23136ed753d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 7 Mar 2020 10:02:27 +0000 Subject: [PATCH 03/34] [release/5.0.1xx-preview2] Update dependencies from dotnet/sdk (#6722) * Update dependencies from https://github.com/dotnet/sdk build 20200306.6 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20156.6 - Microsoft.NET.Sdk - 5.0.100-preview.2.20156.6 * Update dependencies from https://github.com/dotnet/sdk build 20200306.8 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20156.8 - Microsoft.NET.Sdk - 5.0.100-preview.2.20156.8 Co-authored-by: dotnet-maestro[bot] --- 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 28255ca88..70a96de5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 4cbe9e2cfe869010e81341957956ed626ea752fd + bdb55e2841c7632ff6bb24cadb4d9adb03c8ef17 - + https://github.com/dotnet/sdk - 4cbe9e2cfe869010e81341957956ed626ea752fd + bdb55e2841c7632ff6bb24cadb4d9adb03c8ef17 diff --git a/eng/Versions.props b/eng/Versions.props index 23a4e847e..febfbbf7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20156.4 - 5.0.100-preview.2.20156.4 + 5.0.100-preview.2.20156.8 + 5.0.100-preview.2.20156.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b20a3f2385f2d86cd83d94a7f278bfc38f4b6794 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2020 19:17:13 +0000 Subject: [PATCH 04/34] [release/5.0.1xx-preview2] Update dependencies from dotnet/windowsdesktop (#6715) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200306.1 - Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20156.1 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.2.20156.1 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.2.20156.1 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.2.20155.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.2.20155.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200306.8 - Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20156.8 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.2.20156.8 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.2.20156.8 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.2.20155.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.2.20156.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200306.9 - Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20156.9 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.2.20156.9 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.2.20156.9 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.2.20155.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.2.20156.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) * Update dependencies from https://github.com/dotnet/windowsdesktop build 20200309.2 - Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20159.2 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.2.20159.2 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.2.20159.2 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 5.0.0-preview.2.20155.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.DotNet.Wpf.ProjectTemplates - 5.0.0-preview.2.20156.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70a96de5c..15448496d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - abdc676340b53a0644d28f6b587ed2b9c80ca64e + c846d25bec7fc29e234e856ab161d82049f4751d - + https://github.com/dotnet/windowsdesktop - abdc676340b53a0644d28f6b587ed2b9c80ca64e + c846d25bec7fc29e234e856ab161d82049f4751d - + https://github.com/dotnet/windowsdesktop - abdc676340b53a0644d28f6b587ed2b9c80ca64e + c846d25bec7fc29e234e856ab161d82049f4751d https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ bdb55e2841c7632ff6bb24cadb4d9adb03c8ef17 - + https://github.com/dotnet/winforms - 97250206203b7ffeffe6b0ebde69e3fd54b740fe + 355d112ab87257a36a3348caf5669e61c6273850 - + https://github.com/dotnet/wpf - d9b7449f29c21e5c13ca0ee462600233138443b4 + f537c6f80f2395077f8ce1be8a8e37d872d11629 diff --git a/eng/Versions.props b/eng/Versions.props index febfbbf7d..bc674e70a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.3.20155.2 + 5.0.0-preview.2.20155.3 - 5.0.0-preview.3.20156.3 + 5.0.0-preview.2.20156.7 @@ -69,9 +69,9 @@ - 5.0.0-preview.3.20156.5 - 5.0.0-preview.3.20156.5 - 5.0.0-preview.3.20156.5 + 5.0.0-preview.2.20159.2 + 5.0.0-preview.2.20159.2 + 5.0.0-preview.2.20159.2 From eff827fdaf9e650bee3a6a0e5887598409a0c4f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 09:06:03 +0000 Subject: [PATCH 05/34] Update dependencies from https://github.com/dotnet/aspnetcore build 20200309.14 (#6747) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.2.20159.14 - dotnet-user-secrets - 5.0.0-preview.2.20159.14 - dotnet-watch - 5.0.0-preview.2.20159.14 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.2.20159.14 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.2.20159.14 - dotnet-dev-certs - 5.0.0-preview.2.20159.14 Co-authored-by: dotnet-maestro[bot] --- 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 15448496d..c5ae387ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime e2881ae96bb4399864723aa46469c82379b03b32 - + https://github.com/dotnet/aspnetcore - 850240804c9bbf949c6e7d0ff5593153f4801648 + bc83487ac40c020f046f89cf880a39d3bf23485b - + https://github.com/dotnet/aspnetcore - 850240804c9bbf949c6e7d0ff5593153f4801648 + bc83487ac40c020f046f89cf880a39d3bf23485b - + https://github.com/dotnet/aspnetcore - 850240804c9bbf949c6e7d0ff5593153f4801648 + bc83487ac40c020f046f89cf880a39d3bf23485b - + https://github.com/dotnet/aspnetcore - 850240804c9bbf949c6e7d0ff5593153f4801648 + bc83487ac40c020f046f89cf880a39d3bf23485b - + https://github.com/dotnet/aspnetcore - 850240804c9bbf949c6e7d0ff5593153f4801648 + bc83487ac40c020f046f89cf880a39d3bf23485b - + https://github.com/dotnet/aspnetcore - 850240804c9bbf949c6e7d0ff5593153f4801648 + bc83487ac40c020f046f89cf880a39d3bf23485b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index bc674e70a..eb6d00bd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.2.20156.4 - 5.0.0-preview.2.20156.4 - 5.0.0-preview.2.20156.4 - 5.0.0-preview.2.20156.4 - 5.0.0-preview.2.20156.4 - 5.0.0-preview.2.20156.4 + 5.0.0-preview.2.20159.14 + 5.0.0-preview.2.20159.14 + 5.0.0-preview.2.20159.14 + 5.0.0-preview.2.20159.14 + 5.0.0-preview.2.20159.14 + 5.0.0-preview.2.20159.14 0.2.0 From 1323bc819f8cfc44246453e8d14cbf07ba8db682 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 15:00:07 +0000 Subject: [PATCH 06/34] Update dependencies from https://github.com/dotnet/sdk build 20200309.5 (#6745) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20159.5 - Microsoft.NET.Sdk - 5.0.100-preview.2.20159.5 Co-authored-by: dotnet-maestro[bot] --- 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 c5ae387ac..0a515c68f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - bdb55e2841c7632ff6bb24cadb4d9adb03c8ef17 + 3d4c4651e2a60c00db0effc9741289581f004a00 - + https://github.com/dotnet/sdk - bdb55e2841c7632ff6bb24cadb4d9adb03c8ef17 + 3d4c4651e2a60c00db0effc9741289581f004a00 diff --git a/eng/Versions.props b/eng/Versions.props index eb6d00bd9..de749273e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20156.8 - 5.0.100-preview.2.20156.8 + 5.0.100-preview.2.20159.5 + 5.0.100-preview.2.20159.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bb5626a1812553e17a4957305d0e46a8f8559865 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 15:26:07 +0000 Subject: [PATCH 07/34] Update dependencies from https://github.com/dotnet/sdk build 20200310.3 (#6750) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20160.3 - Microsoft.NET.Sdk - 5.0.100-preview.2.20160.3 Co-authored-by: dotnet-maestro[bot] --- 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 0a515c68f..2c69ac5a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 3d4c4651e2a60c00db0effc9741289581f004a00 + 0ec10a5eb5dd4cbc4a6aadd61d891ed788b828fd - + https://github.com/dotnet/sdk - 3d4c4651e2a60c00db0effc9741289581f004a00 + 0ec10a5eb5dd4cbc4a6aadd61d891ed788b828fd diff --git a/eng/Versions.props b/eng/Versions.props index de749273e..96060dae1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20159.5 - 5.0.100-preview.2.20159.5 + 5.0.100-preview.2.20160.3 + 5.0.100-preview.2.20160.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b1a65c534b85fc0e625db88ea2ee1a8bb50438b0 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Tue, 10 Mar 2020 10:07:39 -0700 Subject: [PATCH 08/34] Updating 3.1.x default runtime versions --- src/redist/targets/GenerateBundledVersions.targets | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 8fd02ff20..b657fdb0c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -246,7 +246,7 @@ Copyright (c) .NET Foundation. All rights reserved. Date: Wed, 11 Mar 2020 00:31:25 +0000 Subject: [PATCH 09/34] Update dependencies from https://github.com/dotnet/runtime build 20200310.6 (#6760) - Microsoft.NETCore.Platforms - 5.0.0-preview.2.20160.6 - Microsoft.NETCore.DotNetHostResolver - 5.0.0-preview.2.20160.6 - Microsoft.NETCore.App.Runtime.win-x64 - 5.0.0-preview.2.20160.6 - Microsoft.NETCore.App.Ref - 5.0.0-preview.2.20160.6 - Microsoft.NETCore.App.Internal - 5.0.0-preview.2.20160.6 - Microsoft.NETCore.App.Host.win-x64 - 5.0.0-preview.2.20160.6 Co-authored-by: dotnet-maestro[bot] --- 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 2c69ac5a5..c8e01f5a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,25 +13,25 @@ https://github.com/dotnet/windowsdesktop c846d25bec7fc29e234e856ab161d82049f4751d - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + d12f79a4d1b908636b96005fe30f547e54cea3ee - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + d12f79a4d1b908636b96005fe30f547e54cea3ee - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + d12f79a4d1b908636b96005fe30f547e54cea3ee - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + d12f79a4d1b908636b96005fe30f547e54cea3ee - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + d12f79a4d1b908636b96005fe30f547e54cea3ee @@ -39,9 +39,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e2881ae96bb4399864723aa46469c82379b03b32 + d12f79a4d1b908636b96005fe30f547e54cea3ee https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 96060dae1..2ce50fbce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,15 +56,15 @@ - 5.0.0-preview.2.20155.1 + 5.0.0-preview.2.20160.6 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 - 5.0.0-preview.2.20155.1 + 5.0.0-preview.2.20160.6 + 5.0.0-preview.2.20160.6 + 5.0.0-preview.2.20160.6 + 5.0.0-preview.2.20160.6 + 5.0.0-preview.2.20160.6 2.1.0 From f95cee69830280177d9d4546e3638930c5d5c274 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 03:10:56 +0000 Subject: [PATCH 10/34] Update dependencies from https://github.com/dotnet/sdk build 20200310.13 (#6765) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20160.13 - Microsoft.NET.Sdk - 5.0.100-preview.2.20160.13 Co-authored-by: dotnet-maestro[bot] --- 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 c8e01f5a7..0bd180745 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 0ec10a5eb5dd4cbc4a6aadd61d891ed788b828fd + d57f0d9484ec5d488f854599b258751d7760439f - + https://github.com/dotnet/sdk - 0ec10a5eb5dd4cbc4a6aadd61d891ed788b828fd + d57f0d9484ec5d488f854599b258751d7760439f diff --git a/eng/Versions.props b/eng/Versions.props index 2ce50fbce..986ba7f4f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20160.3 - 5.0.100-preview.2.20160.3 + 5.0.100-preview.2.20160.13 + 5.0.100-preview.2.20160.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 63a750231d4b873fa6ea2f1da7ee6733d06f6b08 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 06:41:00 +0000 Subject: [PATCH 11/34] Update dependencies from https://github.com/dotnet/sdk build 20200310.15 (#6767) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20160.15 - Microsoft.NET.Sdk - 5.0.100-preview.2.20160.15 Co-authored-by: dotnet-maestro[bot] --- 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 0bd180745..9c64da8d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - d57f0d9484ec5d488f854599b258751d7760439f + e2a83cb27974afc641d0770c56fafbaab4df836c - + https://github.com/dotnet/sdk - d57f0d9484ec5d488f854599b258751d7760439f + e2a83cb27974afc641d0770c56fafbaab4df836c diff --git a/eng/Versions.props b/eng/Versions.props index 986ba7f4f..44ec00b05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20160.13 - 5.0.100-preview.2.20160.13 + 5.0.100-preview.2.20160.15 + 5.0.100-preview.2.20160.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2fb49a0a12fccbd472fcbad7431e988c68676ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 11:20:55 +0000 Subject: [PATCH 12/34] Update dependencies from https://github.com/dotnet/sdk build 20200310.16 (#6769) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20160.16 - Microsoft.NET.Sdk - 5.0.100-preview.2.20160.16 Co-authored-by: dotnet-maestro[bot] --- 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 9c64da8d8..ba9de1633 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - e2a83cb27974afc641d0770c56fafbaab4df836c + f5fa941b26b4cbc8d6d63b8b550d6b03bb2aaa2c - + https://github.com/dotnet/sdk - e2a83cb27974afc641d0770c56fafbaab4df836c + f5fa941b26b4cbc8d6d63b8b550d6b03bb2aaa2c diff --git a/eng/Versions.props b/eng/Versions.props index 44ec00b05..d5d6fd17c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20160.15 - 5.0.100-preview.2.20160.15 + 5.0.100-preview.2.20160.16 + 5.0.100-preview.2.20160.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7dbf8bba1d39b15a05c39a89325f6862755beb2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 08:24:31 -0700 Subject: [PATCH 13/34] Update dependencies from https://github.com/dotnet/windowsdesktop build 20200310.6 (#6764) - Microsoft.WindowsDesktop.App - 5.0.0-preview.2.20160.6 - Microsoft.WindowsDesktop.App.Ref - 5.0.0-preview.2.20160.6 - Microsoft.WindowsDesktop.App.Runtime.win-x64 - 5.0.0-preview.2.20160.6 Co-authored-by: dotnet-maestro[bot] --- 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 ba9de1633..f5b5acc2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - c846d25bec7fc29e234e856ab161d82049f4751d + 17e275d96478caf03dc021c711aee7fcb9fd3ed7 - + https://github.com/dotnet/windowsdesktop - c846d25bec7fc29e234e856ab161d82049f4751d + 17e275d96478caf03dc021c711aee7fcb9fd3ed7 - + https://github.com/dotnet/windowsdesktop - c846d25bec7fc29e234e856ab161d82049f4751d + 17e275d96478caf03dc021c711aee7fcb9fd3ed7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d5d6fd17c..de0ec5cd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 5.0.0-preview.2.20159.2 - 5.0.0-preview.2.20159.2 - 5.0.0-preview.2.20159.2 + 5.0.0-preview.2.20160.6 + 5.0.0-preview.2.20160.6 + 5.0.0-preview.2.20160.6 From 5b8d87977d87f678c3ddacbaefb06450b276d846 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 14:06:20 -0700 Subject: [PATCH 14/34] Update dependencies from https://github.com/dotnet/aspnetcore build 20200310.9 (#6775) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.2.20160.9 - dotnet-user-secrets - 5.0.0-preview.2.20160.9 - dotnet-watch - 5.0.0-preview.2.20160.9 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.2.20160.9 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.2.20160.9 - dotnet-dev-certs - 5.0.0-preview.2.20160.9 Co-authored-by: dotnet-maestro[bot] --- 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 f5b5acc2a..43e18fa85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d12f79a4d1b908636b96005fe30f547e54cea3ee - + https://github.com/dotnet/aspnetcore - bc83487ac40c020f046f89cf880a39d3bf23485b + 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 - + https://github.com/dotnet/aspnetcore - bc83487ac40c020f046f89cf880a39d3bf23485b + 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 - + https://github.com/dotnet/aspnetcore - bc83487ac40c020f046f89cf880a39d3bf23485b + 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 - + https://github.com/dotnet/aspnetcore - bc83487ac40c020f046f89cf880a39d3bf23485b + 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 - + https://github.com/dotnet/aspnetcore - bc83487ac40c020f046f89cf880a39d3bf23485b + 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 - + https://github.com/dotnet/aspnetcore - bc83487ac40c020f046f89cf880a39d3bf23485b + 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index de0ec5cd3..97865e71d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.2.20159.14 - 5.0.0-preview.2.20159.14 - 5.0.0-preview.2.20159.14 - 5.0.0-preview.2.20159.14 - 5.0.0-preview.2.20159.14 - 5.0.0-preview.2.20159.14 + 5.0.0-preview.2.20160.9 + 5.0.0-preview.2.20160.9 + 5.0.0-preview.2.20160.9 + 5.0.0-preview.2.20160.9 + 5.0.0-preview.2.20160.9 + 5.0.0-preview.2.20160.9 0.2.0 From 2de8411fd377cc5ae412cc2f4f87a01480f48508 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Wed, 11 Mar 2020 14:45:36 -0700 Subject: [PATCH 15/34] Updating installer learn more links to 5.0 release notes --- .../targets/packaging/windows/clisdk/LCID/1028/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1029/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1031/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1033/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1036/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1040/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1041/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1042/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1045/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1046/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1049/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/1055/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/2052/bundle.wxl | 2 +- .../targets/packaging/windows/clisdk/LCID/3082/bundle.wxl | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index f65703c11..5b4be6b0e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -75,6 +75,6 @@ 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若您打算透過 Visual Studio 使用 .NET Core 3.1，則需要 Visual Studio 2019 16.4 或更新版本。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">深入了解</A>。 + 若您打算透過 Visual Studio 使用 .NET Core 3.1，則需要 Visual Studio 2019 16.4 或更新版本。<A HREF="https://aka.ms/dotnet5-release-notes">深入了解</A>。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 4820321d8..5fb76c880 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -75,6 +75,6 @@ Zdroje informací Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud plánujete používání .NET Core 3.1 se sadou Visual Studio, potřebujete Visual Studio 2019 16.4 nebo novější. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Další informace</A> + Pokud plánujete používání .NET Core 3.1 se sadou Visual Studio, potřebujete Visual Studio 2019 16.4 nebo novější. <A HREF="https://aka.ms/dotnet5-release-notes">Další informace</A> diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index c96bed8ea..a3d44e6a0 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -75,6 +75,6 @@ Ressourcen Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie .NET Core 3.1 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.4 oder höher erforderlich. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Weitere Informationen</A>. + Wenn Sie .NET Core 3.1 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.4 oder höher erforderlich. <A HREF="https://aka.ms/dotnet5-release-notes">Weitere Informationen</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl index caf7b745c..6fbedd58b 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1033/bundle.wxl @@ -75,6 +75,6 @@ Resources Installation note A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete. - If you plan to use .NET 5.0 with Visual Studio, Visual Studio 2019 16.6 or newer is required. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Learn More</A>. + If you plan to use .NET 5.0 with Visual Studio, Visual Studio 2019 16.6 or newer is required. <A HREF="https://aka.ms/dotnet5-release-notes">Learn More</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index 4ae70620f..9186ca976 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -75,6 +75,6 @@ Ressources Note d'installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous envisagez d'utiliser .NET Core 3.1 avec Visual Studio, Visual Studio 2019 16.4 ou une version plus récente est nécessaire. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">En savoir plus</A>. + Si vous envisagez d'utiliser .NET Core 3.1 avec Visual Studio, Visual Studio 2019 16.4 ou une version plus récente est nécessaire. <A HREF="https://aka.ms/dotnet5-release-notes">En savoir plus</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 10ef2f2b5..85d45413b 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -75,6 +75,6 @@ Resources Nota sull'installazione Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto. - Se si intende usare .NET Core 3.1 con Visual Studio, è richiesto Visual Studio 2019 16.4 o versione successiva. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Altre informazioni</A>. + Se si intende usare .NET Core 3.1 con Visual Studio, è richiesto Visual Studio 2019 16.4 o versione successiva. <A HREF="https://aka.ms/dotnet5-release-notes">Altre informazioni</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 40d75f8cb..e4532e959 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -75,6 +75,6 @@ インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .Net Core 3.1 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.4 以降が必要です。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">詳細情報</A>。 + .Net Core 3.1 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.4 以降が必要です。<A HREF="https://aka.ms/dotnet5-release-notes">詳細情報</A>。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index fc4e2273a..84b384617 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -75,6 +75,6 @@ 설치 정보 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. - Visual Studio와 함께 .NET Core 3.1을 사용하려면 Visual Studio 2019 16.4 이상이 필요합니다. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">자세한 정보</A> + Visual Studio와 함께 .NET Core 3.1을 사용하려면 Visual Studio 2019 16.4 이상이 필요합니다. <A HREF="https://aka.ms/dotnet5-release-notes">자세한 정보</A> diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index a0344ed83..3c698c734 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -75,6 +75,6 @@ Zasoby Uwaga dotycząca instalacji W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę. - Jeśli planujesz używać platformy .NET Core 3.1 z programem Visual Studio, wymagany jest program Visual Studio 2019 16.4 lub nowszy. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Dowiedz się więcej</A>. + Jeśli planujesz używać platformy .NET Core 3.1 z programem Visual Studio, wymagany jest program Visual Studio 2019 16.4 lub nowszy. <A HREF="https://aka.ms/dotnet5-release-notes">Dowiedz się więcej</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index f494508f5..73853e2dd 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -75,6 +75,6 @@ Recursos Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - Se você planeja usar o .NET Core 3.1 com o Visual Studio, o Visual Studio 2019 16.4 ou mais recente será necessário. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Saiba mais</A>. + Se você planeja usar o .NET Core 3.1 com o Visual Studio, o Visual Studio 2019 16.4 ou mais recente será necessário. <A HREF="https://aka.ms/dotnet5-release-notes">Saiba mais</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index 9ca119ea0..8e4502f0e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -75,6 +75,6 @@ Примечание по установке В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. - Если вы планируете использовать .NET Core 3.1 с Visual Studio, требуется Visual Studio 2019 16.4 или более поздней версии. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Подробнее</A>. + Если вы планируете использовать .NET Core 3.1 с Visual Studio, требуется Visual Studio 2019 16.4 или более поздней версии. <A HREF="https://aka.ms/dotnet5-release-notes">Подробнее</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index 836150aca..4360cede4 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -75,6 +75,6 @@ Kaynaklar Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET Core 3.1 kullanmayı planlıyorsanız, Visual Studio 2019 16.4 veya daha yeni bir sürüm gerekir. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Daha Fazla Bilgi</A>. + Visual Studio ile .NET Core 3.1 kullanmayı planlıyorsanız, Visual Studio 2019 16.4 veya daha yeni bir sürüm gerekir. <A HREF="https://aka.ms/dotnet5-release-notes">Daha Fazla Bilgi</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index 8b5f2100b..02b2a247b 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -75,6 +75,6 @@ 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果计划结合使用 .NET Core 3.1 和 Visual Studio，需要 Visual Studio 2019 16.4 或更高版本。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">了解详细信息</A>。 + 如果计划结合使用 .NET Core 3.1 和 Visual Studio，需要 Visual Studio 2019 16.4 或更高版本。<A HREF="https://aka.ms/dotnet5-release-notes">了解详细信息</A>。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index a2000af4d..0cea655ff 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -75,6 +75,6 @@ Recursos Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si planea usar .NET Core 3.1 con Visual Studio, se requiere Visual Studio 2019 16.4 o una versión más reciente. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Más información</A>. + Si planea usar .NET Core 3.1 con Visual Studio, se requiere Visual Studio 2019 16.4 o una versión más reciente. <A HREF="https://aka.ms/dotnet5-release-notes">Más información</A>. From 9c30c9b429add311e047bfb87c4d4119673fa461 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2020 17:47:35 -0700 Subject: [PATCH 16/34] Update dependencies from https://github.com/dotnet/sdk build 20200311.5 (#6781) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20161.5 - Microsoft.NET.Sdk - 5.0.100-preview.2.20161.5 Co-authored-by: dotnet-maestro[bot] --- 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 43e18fa85..144f182d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - f5fa941b26b4cbc8d6d63b8b550d6b03bb2aaa2c + 11d68c998c996a9e033760f4769132cf867de167 - + https://github.com/dotnet/sdk - f5fa941b26b4cbc8d6d63b8b550d6b03bb2aaa2c + 11d68c998c996a9e033760f4769132cf867de167 diff --git a/eng/Versions.props b/eng/Versions.props index 97865e71d..9cfbb422c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20160.16 - 5.0.100-preview.2.20160.16 + 5.0.100-preview.2.20161.5 + 5.0.100-preview.2.20161.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e72094ee06bb292d78c57999254d3a6ce6ea716 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 12 Mar 2020 17:54:23 +0100 Subject: [PATCH 17/34] Add subscription for 5.0 test templates (#6783) --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 144f182d9..7a764e110 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,6 +71,10 @@ https://github.com/dotnet/test-templates 91cbc040733600df96d8a3b86af4d0044bb51a8d + + https://github.com/dotnet/test-templates + 91cbc040733600df96d8a3b86af4d0044bb51a8d + https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 From d0b5a76c820025a1a2a0d9c9a16bee9049de91e2 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Thu, 12 Mar 2020 13:02:10 -0700 Subject: [PATCH 18/34] Updating to 2.1.17 patch version --- src/redist/targets/GenerateBundledVersions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b657fdb0c..8dcd9397b 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -108,7 +108,7 @@ + LatestVersion="2.1.17" /> + LatestVersion="2.1.17"/> + LatestVersion="2.1.17"/> Date: Thu, 12 Mar 2020 21:00:56 +0000 Subject: [PATCH 19/34] Update dependencies from https://github.com/dotnet/sdk build 20200312.4 (#6796) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20162.4 - Microsoft.NET.Sdk - 5.0.100-preview.2.20162.4 Co-authored-by: dotnet-maestro[bot] --- 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 7a764e110..9124cf85d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 11d68c998c996a9e033760f4769132cf867de167 + d9e357732f5087adf65a78a37d721c83d4429e98 - + https://github.com/dotnet/sdk - 11d68c998c996a9e033760f4769132cf867de167 + d9e357732f5087adf65a78a37d721c83d4429e98 diff --git a/eng/Versions.props b/eng/Versions.props index 9cfbb422c..c58e1a59f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20161.5 - 5.0.100-preview.2.20161.5 + 5.0.100-preview.2.20162.4 + 5.0.100-preview.2.20162.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 57540c8182cf181ee9f82683826135622a5c96fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 01:16:27 +0000 Subject: [PATCH 20/34] Update dependencies from https://github.com/dotnet/sdk build 20200312.6 (#6801) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20162.6 - Microsoft.NET.Sdk - 5.0.100-preview.2.20162.6 Co-authored-by: dotnet-maestro[bot] --- 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 9124cf85d..ecad46912 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - d9e357732f5087adf65a78a37d721c83d4429e98 + 408c6de715dcab76239a3aae09677525503d8944 - + https://github.com/dotnet/sdk - d9e357732f5087adf65a78a37d721c83d4429e98 + 408c6de715dcab76239a3aae09677525503d8944 diff --git a/eng/Versions.props b/eng/Versions.props index c58e1a59f..a5d137041 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20162.4 - 5.0.100-preview.2.20162.4 + 5.0.100-preview.2.20162.6 + 5.0.100-preview.2.20162.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 213e594b3833d059ec82a948b5e3a939dc6f4d2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 03:45:01 +0000 Subject: [PATCH 21/34] Update dependencies from https://github.com/dotnet/test-templates build 20200312.1 (#6790) - Microsoft.DotNet.Test.ProjectTemplates.3.1 - 1.0.2-beta4.20162.1 - Microsoft.DotNet.Test.ProjectTemplates.5.0 - 1.0.2-beta4.20162.1 Co-authored-by: dotnet-maestro[bot] --- 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 ecad46912..8ad6f943b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,13 +67,13 @@ https://github.com/dotnet/aspnetcore 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 - + https://github.com/dotnet/test-templates - 91cbc040733600df96d8a3b86af4d0044bb51a8d + e8e924b5937e75ab3049d57cb5fb196ea2e3332c - + https://github.com/dotnet/test-templates - 91cbc040733600df96d8a3b86af4d0044bb51a8d + e8e924b5937e75ab3049d57cb5fb196ea2e3332c https://github.com/dotnet/templating diff --git a/eng/Versions.props b/eng/Versions.props index a5d137041..8da85a7cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ - 1.0.2-beta4.20126.1 + 1.0.2-beta4.20162.1 @@ -99,7 +99,7 @@ 1.7.1 3.1.2 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 1.0.2-beta4.20126.1 + 1.0.2-beta4.20162.1 3.1.2 4.8.0-rc2.19462.10 From 4fbe21fdfa8d9357318515b0c638664df003679b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 11:07:32 +0000 Subject: [PATCH 22/34] Update dependencies from https://github.com/dotnet/sdk build 20200312.8 (#6805) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20162.8 - Microsoft.NET.Sdk - 5.0.100-preview.2.20162.8 Co-authored-by: dotnet-maestro[bot] --- 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 8ad6f943b..2b157119a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,13 +79,13 @@ https://github.com/dotnet/templating f15388ee6e45a8923fba0f54f55154aee991fb84 - + https://github.com/dotnet/sdk - 408c6de715dcab76239a3aae09677525503d8944 + fc4c4f57d332059da403bdbe3897fd809c926d8a - + https://github.com/dotnet/sdk - 408c6de715dcab76239a3aae09677525503d8944 + fc4c4f57d332059da403bdbe3897fd809c926d8a diff --git a/eng/Versions.props b/eng/Versions.props index 8da85a7cc..16eeeff76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20162.6 - 5.0.100-preview.2.20162.6 + 5.0.100-preview.2.20162.8 + 5.0.100-preview.2.20162.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b5bccca3f58bcaeef39316191a7fb94c18cfc527 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 13 Mar 2020 12:59:04 +0100 Subject: [PATCH 23/34] Add test templates dependency for 2.1 (#6806) --- eng/Version.Details.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b157119a..89fc3c8b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,6 +67,10 @@ https://github.com/dotnet/aspnetcore 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 + + https://github.com/dotnet/test-templates + e8e924b5937e75ab3049d57cb5fb196ea2e3332c + https://github.com/dotnet/test-templates e8e924b5937e75ab3049d57cb5fb196ea2e3332c From e99dc08b361b04d0151268f04f4ad3bfcb686ccd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 15 Mar 2020 13:14:26 +0000 Subject: [PATCH 24/34] [release/5.0.1xx-preview2] Update dependencies from dotnet/templating (#6819) * Update dependencies from https://github.com/dotnet/templating build 20200314.2 - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.2.20164.2 * Update dependencies from https://github.com/dotnet/templating build 20200314.4 - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.2.20164.4 * Update template tests * Concat net tfms instead of replacing Co-authored-by: dotnet-maestro[bot] Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 4 +- eng/Versions.props | 2 +- .../GivenSelfContainedAppsRollForward.cs | 12 +--- test/EndToEnd/SupportedNetCoreAppVersions.cs | 57 ++++++++----------- 4 files changed, 30 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89fc3c8b3..ce49cc383 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,9 +79,9 @@ https://github.com/dotnet/test-templates e8e924b5937e75ab3049d57cb5fb196ea2e3332c - + https://github.com/dotnet/templating - f15388ee6e45a8923fba0f54f55154aee991fb84 + bd8fc17967503221519906c76546192e14fcdfa8 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 16eeeff76..a7c53afc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-preview.2.20151.1 + 5.0.0-preview.2.20164.4 diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 6b85a2400..9f99f850b 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; -using System.Runtime.InteropServices; -using System.Text; using System.Xml.Linq; using FluentAssertions; using Microsoft.DotNet.TestFramework; @@ -157,7 +154,7 @@ namespace EndToEnd .Element(ns + "TargetFramework") .Value; - SupportedNetCoreAppVersions.Versions.Select(v => $"netcoreapp{v}") + TargetFrameworkHelper.GetNetAppTargetFrameworks(SupportedNetCoreAppVersions.Versions) .Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " + "of .NET Core created by \"dotnet new\""); } @@ -184,12 +181,9 @@ namespace EndToEnd .Element(ns + "TargetFramework") .Value; - SupportedAspNetCoreVersions.Versions.Select(v => $"netcoreapp{v}") + TargetFrameworkHelper.GetNetAppTargetFrameworks(SupportedAspNetCoreVersions.Versions) .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreVersions)} should include the default version " + - "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\""); - - + "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\""); } - } } diff --git a/test/EndToEnd/SupportedNetCoreAppVersions.cs b/test/EndToEnd/SupportedNetCoreAppVersions.cs index 512b9e78a..9504a0c97 100644 --- a/test/EndToEnd/SupportedNetCoreAppVersions.cs +++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs @@ -2,33 +2,34 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using Xunit; namespace EndToEnd { + public static class TargetFrameworkHelper + { + private static Version _firstNetAppVersion = new Version(5, 0); + + public static IEnumerable GetNetAppTargetFrameworks(IEnumerable versions) => + versions.Select(v => $"netcoreapp{v}") + // Add netX.X tfms starting with 5.0 + .Concat(versions.Where(v => Version.Parse(v) >= _firstNetAppVersion).Select(v => $"net{v}")); + } + public class SupportedNetCoreAppVersions : IEnumerable { public IEnumerator GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - public static IEnumerable Versions + public static IEnumerable Versions => new[] { - get - { - return new[] - { - "1.0", - "1.1", - "2.0", - "2.1", - "2.2", - "3.0", - "3.1", - "5.0" - }; - } - } - - + "1.0", + "1.1", + "2.0", + "2.1", + "2.2", + "3.0", + "3.1", + "5.0" + }; } public class SupportedAspNetCoreVersions : IEnumerable @@ -36,13 +37,8 @@ namespace EndToEnd public IEnumerator GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - public static IEnumerable Versions - { - get - { - return SupportedNetCoreAppVersions.Versions.Except(new List() { "1.0", "1.1", "2.0" }); - } - } + public static IEnumerable Versions => + SupportedNetCoreAppVersions.Versions.Except(new List() { "1.0", "1.1", "2.0" }); } public class SupportedAspNetCoreAllVersions : IEnumerable @@ -50,12 +46,7 @@ namespace EndToEnd public IEnumerator GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); - public static IEnumerable Versions - { - get - { - return SupportedAspNetCoreVersions.Versions.Where(v => new Version(v).Major < 3); - } - } + public static IEnumerable Versions => + SupportedAspNetCoreVersions.Versions.Where(v => new Version(v).Major < 3); } } From 2deda3ae53ab1f96cae2f37457ef2814ee81e417 Mon Sep 17 00:00:00 2001 From: sfoslund Date: Fri, 6 Mar 2020 15:51:55 -0800 Subject: [PATCH 25/34] Adding support for win arm64 builds --- .vsts-ci.yml | 4 ++++ src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateLayout.targets | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index cef288de0..2954264c2 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -68,6 +68,10 @@ stages: _BuildConfig: Release _BuildArchitecture: arm _DOTNET_CLI_UI_LANGUAGE: '' + Build_Release_arm64: + _BuildConfig: Release + _BuildArchitecture: arm64 + _DOTNET_CLI_UI_LANGUAGE: '' - template: /eng/build.yml parameters: diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index b0aa36fea..1c19fd24c 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,6 +1,6 @@ diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index da0f2ad65..970111c9d 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -283,7 +283,7 @@ false - true + true false From 5b1ee5c1f57ca2bc1dd662afb5808f3a7c1332a4 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Mon, 16 Mar 2020 13:45:51 -0700 Subject: [PATCH 26/34] [skip ci] Publish latest to preview2 specific channel --- src/CopyToLatest/targets/BranchInfo.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index 9bd214aa9..19b6d4da0 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - master + release/5.0.1xx-preview2 From 9e1f0e20a07a77334f8bbe4952c0ec9bef5eabb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbyn=C4=9Bk=20Sailer=20=28Moravia=20IT=29?= Date: Tue, 17 Mar 2020 15:38:36 +0100 Subject: [PATCH 27/34] LOC CHECKIN | dotnet/core-sdk 5.0.1xx-preview1 | 20200317 --- .../windows/clisdk/LCID/1028/bundle.wxl | 16 ++++++++-------- .../windows/clisdk/LCID/1029/bundle.wxl | 8 ++++---- .../windows/clisdk/LCID/1031/bundle.wxl | 10 +++++----- .../windows/clisdk/LCID/1036/bundle.wxl | 6 +++--- .../windows/clisdk/LCID/1040/bundle.wxl | 2 +- .../windows/clisdk/LCID/1041/bundle.wxl | 8 ++++---- .../windows/clisdk/LCID/1042/bundle.wxl | 14 +++++++------- .../windows/clisdk/LCID/1045/bundle.wxl | 8 ++++---- .../windows/clisdk/LCID/1046/bundle.wxl | 8 ++++---- .../windows/clisdk/LCID/1049/bundle.wxl | 18 +++++++++--------- .../windows/clisdk/LCID/1055/bundle.wxl | 6 +++--- .../windows/clisdk/LCID/2052/bundle.wxl | 12 ++++++------ .../windows/clisdk/LCID/3082/bundle.wxl | 6 +++--- 13 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl index f65703c11..28079edd4 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1028/bundle.wxl @@ -51,12 +51,12 @@ 下列項目已安裝在: '[DOTNETHOME]' • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] + • .NET 執行階段 [DOTNETRUNTIMEVERSION] + • ASP.NET Core 執行階段 [ASPNETCOREVERSION] + • .NET Windows Desktop 執行階段 [WINFORMSANDWPFVERSION] -此產品會收集使用方式資料 - • 如需詳細資訊或退出，請前往 https://aka.ms/dotnet-cli-telemetry +此產品會收集使用量資料 + • 如需詳細資訊並退出，請前往 https://aka.ms/dotnet-cli-telemetry 資源 • 如需 .NET 文件，請前往 https://aka.ms/dotnet-docs @@ -65,16 +65,16 @@ • 如需教學課程，請前往 https://aka.ms/dotnet-tutorials .NET SDK - .NET 是 Microsoft 支援的跨平台開放原始碼。您可以用它以 C#、F# 或 VB 建置下一個應用程式。希望您會喜歡! + .NET 是 Microsoft 支援的跨平台開放原始碼。您可以使用 .NET 以 C#、F# 或 VB 建置下一個應用程式。希望您會喜歡! 深入了解 .NET 資源 - <A HREF="https://aka.ms/dotnet-docs">核心文件</A> + <A HREF="https://aka.ms/dotnet-docs">.NET 文件</A> <A HREF="https://aka.ms/dotnet-cli-docs">SDK 文件</A> <A HREF="https://aka.ms/dev-privacy">隱私權聲明</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">.NET 程式庫 EULA</A> 安裝附註 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - 若您打算透過 Visual Studio 使用 .NET Core 3.1，則需要 Visual Studio 2019 16.4 或更新版本。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">深入了解</A>。 + 若您打算透過 Visual Studio 使用 .NET 5.0，則需要 Visual Studio 2019 16.6 或更新版本。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">深入了解</A>。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl index 4820321d8..0ea115267 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1029/bundle.wxl @@ -59,22 +59,22 @@ Tento produkt shromažďuje data o využití. • Další informace a vyjádření výslovného nesouhlasu: https://aka.ms/dotnet-cli-telemetry Zdroje informací - • Dokumentace k .NET: https://aka.ms/dotnet-docs + • Dokumentace k .NET : https://aka.ms/dotnet-docs • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs • Zpráva k vydání verze: https://aka.ms/netcore3releasenotes • Kurzy: https://aka.ms/dotnet-tutorials Sada .NET SDK - .NET je opensourcová, víceplatformová architektura podporovaná společností Microsoft. Můžete ji použít k vytvoření své další aplikace v jazyce C#, F # nebo VB. Věříme, že s ní budete spokojeni. + .NET je opensourcová architektura pro více platforem podporovaná společností Microsoft. Můžete ji použít k vytvoření své další aplikace v jazyce C#, F # nebo VB. Věříme, že s ní budete spokojeni. Další informace o .NET Prostředky - <A HREF="https://aka.ms/dotnet-docs">Dokumentace k platformě Core</A> + <A HREF="https://aka.ms/dotnet-docs">Dokumentace k architektuře .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Dokumentace k sadě SDK</A> <A HREF="https://aka.ms/dev-privacy">Prohlášení o zásadách ochrany osobních údajů</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">Smlouva EULA ke knihovně .NET</A> Poznámka k instalaci Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - Pokud plánujete používání .NET Core 3.1 se sadou Visual Studio, potřebujete Visual Studio 2019 16.4 nebo novější. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Další informace</A> + Pokud plánujete používat .NET 5.0 se sadou Visual Studio, potřebujete Visual Studio 2019 16.6 nebo novější. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Další informace</A> diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl index c96bed8ea..82fd49dd8 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1031/bundle.wxl @@ -49,14 +49,14 @@ &Abbrechen Die Installation war erfolgreich. -Folgendes wurde unter [DOTNETHOME] installiert: +Folgende Komponenten wurden unter [DOTNETHOME] installiert: • .NET SDK [DOTNETSDKVERSION] • .NET Runtime [DOTNETRUNTIMEVERSION] • ASP.NET Core-Runtime [ASPNETCOREVERSION] • .NET Windows Desktop-Runtime [WINFORMSANDWPFVERSION] Dieses Produkt erfasst Nutzungsdaten. - • Weitere Informationen und Abbestellen: https://aka.ms/dotnet-cli-telemetry + • Weitere Informationen und Deaktivieren der Erfassung: https://aka.ms/dotnet-cli-telemetry Ressourcen • .NET-Dokumentation: https://aka.ms/dotnet-docs @@ -65,16 +65,16 @@ Ressourcen • Tutorials: https://aka.ms/dotnet-tutorials .NET SDK - .Net ist eine plattformübergreifende Open-Source-Software, die von Microsoft unterstützt wird. Verwenden Sie sie zur Erstellung Ihrer nächsten App mit C#, F# oder VB. Wir wünschen Ihnen viel Spaß! + .NET ist eine plattformübergreifende Open-Source-Software, die von Microsoft unterstützt wird. Verwenden Sie sie zur Entwicklung Ihrer nächsten App mit C#, F# oder VB. Wir wünschen Ihnen viel Spaß! Weitere Informationen zu .NET Ressourcen - <A HREF="https://aka.ms/dotnet-docs">Core-Dokumentation</A> + <A HREF="https://aka.ms/dotnet-docs">.NET-Dokumentation</A> <A HREF="https://aka.ms/dotnet-cli-docs">SDK-Dokumentation</A> <A HREF="https://aka.ms/dev-privacy">Datenschutzerklärung</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">Lizenzbedingungen für die .NET-Bibliothek</A> Installationshinweis Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - Wenn Sie .NET Core 3.1 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.4 oder höher erforderlich. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Weitere Informationen</A>. + Wenn Sie .NET 5.0 mit Visual Studio verwenden möchten, ist Visual Studio 2019 16.6 oder höher erforderlich. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Weitere Informationen</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl index 4ae70620f..f9dc5558e 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1036/bundle.wxl @@ -63,18 +63,18 @@ Ressources • Documentation du kit SDK sur https://aka.ms/dotnet-sdk-docs • Notes de publication sur https://aka.ms/netcore3releasenotes • Tutoriels sur https://aka.ms/dotnet-tutorials - Kit SDK .NET + SDK .NET .NET est open source, multiplatforme et pris en charge par Microsoft. Vous pouvez l'utiliser pour créer votre prochaine application avec C#, F# ou VB. Nous espérons qu'il vous plaira ! En savoir plus sur .NET Ressources - <A HREF="https://aka.ms/dotnet-docs">Documentation Core</A> + <A HREF="https://aka.ms/dotnet-docs">Documentation .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Documentation du kit SDK</A> <A HREF="https://aka.ms/dev-privacy">Déclaration de confidentialité</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">CLUF de la bibliothèque .NET</A> Note d'installation Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - Si vous envisagez d'utiliser .NET Core 3.1 avec Visual Studio, Visual Studio 2019 16.4 ou une version plus récente est nécessaire. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">En savoir plus</A>. + Si vous envisagez d'utiliser .NET 5.0 avec Visual Studio, Visual Studio 2019 16.6 ou une version plus récente est nécessaire. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">En savoir plus</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl index 10ef2f2b5..018024743 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1040/bundle.wxl @@ -75,6 +75,6 @@ Resources Nota sull'installazione Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto. - Se si intende usare .NET Core 3.1 con Visual Studio, è richiesto Visual Studio 2019 16.4 o versione successiva. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Altre informazioni</A>. + Se si intende usare .NET 5.0 con Visual Studio, è richiesto Visual Studio 2019 16.6 o versione successiva. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Altre informazioni</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl index 40d75f8cb..2ea495289 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1041/bundle.wxl @@ -65,16 +65,16 @@ • チュートリアル https://aka.ms/dotnet-tutorials .NET SDK - .NET は、オープンソースまたはクロスプラットフォームで、Microsoft によってサポートされています。これを使用して、C#、F # または VB で次のアプリをビルドできます。お楽しみいただければ幸いです。 - .Net の詳細 + .NET は、オープンソースまたはクロスプラットフォームで、Microsoft によってサポートされています。これを使用して、C#、F# または VB で次のアプリをビルドできます。お楽しみいただければ幸いです。 + .Net の詳細情報 リソース - <A HREF="https://aka.ms/dotnet-docs">コア ドキュメント</A> + <A HREF="https://aka.ms/dotnet-docs">.NET ドキュメント</A> <A HREF="https://aka.ms/dotnet-cli-docs">SDK ドキュメント</A> <A HREF="https://aka.ms/dev-privacy">プライバシーに関する声明</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">.NET ライブラリのライセンス条項</A> インストール メモ コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - .Net Core 3.1 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.4 以降が必要です。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">詳細情報</A>。 + .NET 5.0 を Visual Studio と共に使用する場合は、Visual Studio 2019 16.6 以降が必要です。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">詳細情報</A>。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl index fc4e2273a..341028118 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1042/bundle.wxl @@ -42,8 +42,8 @@ 다시 시작(&R) 닫기(&C) 사용 중인 파일 - 다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다. - 응용 프로그램을 닫고 다시 시작합니다(&A). + 다음의 애플리케이션이 업데이트해야 할 파일을 사용 중입니다. + 애플리케이션을 닫고 다시 시작합니다(&A). 애플리케이션을 닫지 않습니다(&D). 다시 부팅해야 합니다. 확인(&O) 취소(&C) @@ -55,7 +55,7 @@ • ASP.NET Core 런타임 [ASPNETCOREVERSION] • .NET Windows 데스크톱 런타임 [WINFORMSANDWPFVERSION] -이 제품은 사용량 데이터를 수집합니다. +이 제품은 사용량 현황 데이터를 수집합니다. • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry 리소스 @@ -65,16 +65,16 @@ • 자습서 https://aka.ms/dotnet-tutorials .NET SDK - Microsoft가 지원하는 플랫폼 간 오픈 소스인 .NET를 사용하여 C#, F# 또는 VB로 다음 앱을 빌드할 수 있습니다. .NET를 유용하게 사용하시길 바랍니다. - .NET 에 대한 자세한 정보 + Microsoft가 지원하는 플랫폼 간 오픈 소스인 .NET을 사용하여 C#, F# 또는 VB로 다음 앱을 빌드할 수 있습니다. .NET Core를 유용하게 사용하시길 바랍니다. + .NET에 대한 자세한 정보 리소스 - <A HREF="https://aka.ms/dotnet-docs">Core 설명서</A> + <A HREF="https://aka.ms/dotnet-docs">.NET 설명서</A> <A HREF="https://aka.ms/dotnet-cli-docs">SDK 설명서</A> <A HREF="https://aka.ms/dev-privacy">개인정보처리방침</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">.NET Library EULA</A> 설치 정보 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. - Visual Studio와 함께 .NET Core 3.1을 사용하려면 Visual Studio 2019 16.4 이상이 필요합니다. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">자세한 정보</A> + Visual Studio와 함께 .NET 5.0을 사용하려면 Visual Studio 2019 16.6 이상이 필요합니다. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">자세한 정보</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl index a0344ed83..15526f8ab 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1045/bundle.wxl @@ -63,18 +63,18 @@ Zasoby • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs • Informacje o wersji: https://aka.ms/netcore3releasenotes • Samouczki: https://aka.ms/dotnet-tutorials - Zestaw .NET SDK + .NET SDK - .NET to przeznaczone na wiele platform rozwiązanie typu open source obsługiwane przez firmę Microsoft. Za jego pomocą możesz utworzyć swoją następną aplikację, korzystając z języka C#, F# lub VB. Mamy nadzieję, że Ci się spodoba. + .NET to przeznaczone na wiele platform rozwiązanie typu open source wspierane przez firmę Microsoft. Za jego pomocą możesz utworzyć swoją następną aplikację, korzystając z języka C#, F# lub VB. Mamy nadzieję, że Ci się spodoba. Dowiedz się więcej o platformie .NET Zasoby - <A HREF="https://aka.ms/dotnet-docs">Dokumentacja programu Core</A> + <A HREF="https://aka.ms/dotnet-docs">Dokumentacja platformy .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Dokumentacja zestawu SDK</A> <A HREF="https://aka.ms/dev-privacy">Zasady zachowania poufności informacji</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">Umowa licencyjna użytkownika oprogramowania biblioteki .NET</A> Uwaga dotycząca instalacji W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę. - Jeśli planujesz używać platformy .NET Core 3.1 z programem Visual Studio, wymagany jest program Visual Studio 2019 16.4 lub nowszy. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Dowiedz się więcej</A>. + Jeśli planujesz używać platformy .NET 5.0 z programem Visual Studio, wymagany jest program Visual Studio 2019 16.6 lub nowszy. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Dowiedz się więcej</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl index f494508f5..9c4b544de 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl @@ -56,7 +56,7 @@ O seguinte foi instalado em: '[DOTNETHOME]' • Runtime da Área de Trabalho do Windows do .NET [WINFORMSANDWPFVERSION] Este produto coleta dados de uso - • Para obter mais informações e recusar, acesse https://aka.ms/dotnet-cli-telemetry + • Para obter mais informações ou recusá-lo, acesse https://aka.ms/dotnet-cli-telemetry Recursos • Documentação do .NET: https://aka.ms/dotnet-docs @@ -65,16 +65,16 @@ Recursos • Tutoriais: https://aka.ms/dotnet-tutorials SDK do .NET - O .NET é um software livre, multiplataforma e com suporte da Microsoft. Você pode usá-lo para criar seu próximo aplicativo, com C#, F# ou VB. Esperamos que você goste! + O .NET é um software livre multiplataforma, com suporte da Microsoft. Você pode usá-lo para criar seu próximo aplicativo, com C#, F# ou VB. Esperamos que você goste. Saiba mais sobre o .NET Recursos - <A HREF="https://aka.ms/dotnet-docs">Documentação Principal</A> + <A HREF="https://aka.ms/dotnet-docs">Documentação do .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Documentação do SDK</A> <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">Termos de licença da Biblioteca do .NET</A> Nota de instalação Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - Se você planeja usar o .NET Core 3.1 com o Visual Studio, o Visual Studio 2019 16.4 ou mais recente será necessário. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Saiba mais</A>. + Se você planeja usar o .NET 5.0 com o Visual Studio, será necessário usar o Visual Studio 2019 16.6 ou mais recente. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Saiba mais</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl index 9ca119ea0..dac41ce11 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1049/bundle.wxl @@ -49,32 +49,32 @@ Отм&ена Установка выполнена. -В "[DOTNETHOME]" установлены следующие компоненты. - • Пакет SDK для .NET Core [DOTNETSDKVERSION] - • Среда выполнения .NET Core [DOTNETRUNTIMEVERSION] +В "[DOTNETHOME]" установлены следующие компоненты: + • Пакет SDK для .NET [DOTNETSDKVERSION] + • Среда выполнения .NET [DOTNETRUNTIMEVERSION] • Среда выполнения ASP.NET Core [ASPNETCOREVERSION] - • Среда выполнения .NET Core для Windows Desktop [WINFORMSANDWPFVERSION] + • Среда выполнения .NET для Windows Desktop [WINFORMSANDWPFVERSION] Этот продукт собирает данные об использовании. • Дополнительные сведения и отказ: https://aka.ms/dotnet-cli-telemetry Ресурсы - • Документация по .NET Core: https://aka.ms/dotnet-docs + • Документация по .NET: https://aka.ms/dotnet-docs • Документация по SDK: https://aka.ms/dotnet-sdk-docs • Заметки о выпуске: https://aka.ms/netcore3releasenotes • Учебники: https://aka.ms/dotnet-tutorials - Пакет SDK для .NET + Пакет SDK для .NET - .NET Core — это кроссплатформенное решение с открытым кодом, поддерживаемое корпорацией Майкрософт. Создавайте с его помощью приложения на C#, F# и Visual Basic. Надеемся, оно вам понравится! + .NET — это кроссплатформенное решение с открытым кодом, поддерживаемое корпорацией Майкрософт. Создавайте с его помощью приложения на C#, F# и Visual Basic. Надеемся, оно вам понравится! Дополнительные сведения о .NET Ресурсы - <A HREF="https://aka.ms/dotnet-docs">Документация по продукту Core</A> + <A HREF="https://aka.ms/dotnet-docs">Документация по .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Документация по пакету SDK</A> <A HREF="https://aka.ms/dev-privacy">Заявление о конфиденциальности</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">Лицензионное соглашение для библиотеки .NET</A> Примечание по установке В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. - Если вы планируете использовать .NET Core 3.1 с Visual Studio, требуется Visual Studio 2019 16.4 или более поздней версии. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Подробнее</A>. + Если вы планируете использовать .NET 5.0 с Visual Studio, требуется Visual Studio 2019 версии 16.6 или более поздней. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Подробнее</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl index 836150aca..5560abc63 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/1055/bundle.wxl @@ -65,16 +65,16 @@ Kaynaklar • Öğreticiler https://aka.ms/dotnet-tutorials .NET SDK'sı - .NET açık kaynaktır, platformlar arası çalışır ve Microsoft tarafından desteklenir. C#, F# veya VB kullanarak sonraki uygulamanızı geliştirmek için .NET'u kullanabilirsiniz. Keyifle kullanmanızı dileriz! + .NET açık kaynaktır, platformlar arası çalışır ve Microsoft tarafından desteklenir. C#, F# veya VB kullanarak sonraki uygulamanızı geliştirmek için .NET'i kullanabilirsiniz. Keyifle kullanmanızı dileriz! .NET hakkında daha fazla bilgi edinin Kaynaklar - <A HREF="https://aka.ms/dotnet-docs">Çekirdek Belgeler</A> + <A HREF="https://aka.ms/dotnet-docs">.NET Belgeleri</A> <A HREF="https://aka.ms/dotnet-cli-docs">SDK Belgeleri</A> <A HREF="https://aka.ms/dev-privacy">Gizlilik Bildirimi</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">.NET Kitaplığı EULA</A> Yükleme notu Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - Visual Studio ile .NET Core 3.1 kullanmayı planlıyorsanız, Visual Studio 2019 16.4 veya daha yeni bir sürüm gerekir. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Daha Fazla Bilgi</A>. + Visual Studio ile .NET 5.0 kullanmayı planlıyorsanız Visual Studio 2019 16.6 veya daha yeni bir sürüm gerekir. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Daha Fazla Bilgi</A>. diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl index 8b5f2100b..db7f82898 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/2052/bundle.wxl @@ -2,7 +2,7 @@ [WixBundleName] 安装程序 [BUNDLEMONIKER] - 您确定要取消吗? + 是否确实要取消? 上一版本 安装程序帮助 /install | /repair | /uninstall | /layout [\[]"directory"[\]] - 安装、修复、卸载 @@ -51,9 +51,9 @@ 下列项安装于: “[DOTNETHOME]” • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] + • .NET 运行时 [DOTNETRUNTIMEVERSION] + • ASP.NET Core 运行时 [ASPNETCOREVERSION] + • .NET Windows Desktop 运行时 [WINFORMSANDWPFVERSION] 此产品会收集用法数据 • 详细信息和选择退出选项: https://aka.ms/dotnet-cli-telemetry @@ -68,13 +68,13 @@ .NET 是开源、跨平台的，且由 Microsoft 提供支持。通过它，可使用 C#、F# 或 VB 构建你的下一个应用。希望你喜欢它! 了解有关 .NET 的详细信息 资源 - <A HREF="https://aka.ms/dotnet-docs">Core 文档</A> + <A HREF="https://aka.ms/dotnet-docs">.NET 文档</A> <A HREF="https://aka.ms/dotnet-cli-docs">SDK 文档</A> <A HREF="https://aka.ms/dev-privacy">隐私声明</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">.NET 库 EULA</A> 安装说明 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - 如果计划结合使用 .NET Core 3.1 和 Visual Studio，需要 Visual Studio 2019 16.4 或更高版本。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">了解详细信息</A>。 + 如果计划结合使用 .NET 5.0 和 Visual Studio，需要 Visual Studio 2019 16.6 或更高版本。<A HREF="https://go.microsoft.com/fwlink/?linkid=866799">了解详细信息</A>。 diff --git a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl index a2000af4d..97989eb7c 100644 --- a/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl +++ b/src/redist/targets/packaging/windows/clisdk/LCID/3082/bundle.wxl @@ -56,7 +56,7 @@ Se instaló lo siguiente en: "[DOTNETHOME]" • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] Este producto recopila datos de uso - • Para más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry + • Para obtener más información y declinar la participación, visite https://aka.ms/dotnet-cli-telemetry Recursos • Documentación de .NET https://aka.ms/dotnet-docs @@ -68,13 +68,13 @@ Recursos .NET es una multiplataforma de código abierto admitida por Microsoft. Puede usarla para compilar su próxima aplicación con C#, F# o VB. Esperamos que la disfrute. Más información sobre .NET Recursos - <A HREF="https://aka.ms/dotnet-docs">Documentación principal</A> + <A HREF="https://aka.ms/dotnet-docs">Documentación de .NET</A> <A HREF="https://aka.ms/dotnet-cli-docs">Documentación del SDK</A> <A HREF="https://aka.ms/dev-privacy">Declaración de privacidad</A> <A HREF="https://go.microsoft.com/fwlink/?LinkId=329770">CLUF de la biblioteca .NET</A> Nota de instalación Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - Si planea usar .NET Core 3.1 con Visual Studio, se requiere Visual Studio 2019 16.4 o una versión más reciente. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Más información</A>. + Si planea usar .NET 5.0 con Visual Studio, se requiere Visual Studio 2019 16.6 o una versión más reciente. <A HREF="https://go.microsoft.com/fwlink/?linkid=866799">Más información</A>. From 7a06fdf87b69beb773de0130f30e793198fa7178 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 19:56:04 +0000 Subject: [PATCH 28/34] Update dependencies from https://github.com/dotnet/aspnetcore build 20200317.3 (#6837) - VS.Redist.Common.AspNetCore.TargetingPack.x64.5.0 - 5.0.0-preview.2.20167.3 - dotnet-dev-certs - 5.0.0-preview.2.20167.3 - dotnet-user-secrets - 5.0.0-preview.2.20167.3 - dotnet-watch - 5.0.0-preview.2.20167.3 - Microsoft.AspNetCore.App.Ref - 5.0.0-preview.2.20167.3 - Microsoft.AspNetCore.App.Runtime.win-x64 - 5.0.0-preview.2.20167.3 Co-authored-by: dotnet-maestro[bot] --- 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 ce49cc383..c4922e3b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,29 +43,29 @@ https://github.com/dotnet/runtime d12f79a4d1b908636b96005fe30f547e54cea3ee - + https://github.com/dotnet/aspnetcore - 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 + f6897a5bb7ca767df8eb465bf15b193c878fffbf - + https://github.com/dotnet/aspnetcore - 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 + f6897a5bb7ca767df8eb465bf15b193c878fffbf - + https://github.com/dotnet/aspnetcore - 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 + f6897a5bb7ca767df8eb465bf15b193c878fffbf - + https://github.com/dotnet/aspnetcore - 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 + f6897a5bb7ca767df8eb465bf15b193c878fffbf - + https://github.com/dotnet/aspnetcore - 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 + f6897a5bb7ca767df8eb465bf15b193c878fffbf - + https://github.com/dotnet/aspnetcore - 19379d2de0cdcc8c89183bd8dbb847e145b16bd2 + f6897a5bb7ca767df8eb465bf15b193c878fffbf https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a7c53afc1..d92abe2f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,12 +37,12 @@ - 5.0.0-preview.2.20160.9 - 5.0.0-preview.2.20160.9 - 5.0.0-preview.2.20160.9 - 5.0.0-preview.2.20160.9 - 5.0.0-preview.2.20160.9 - 5.0.0-preview.2.20160.9 + 5.0.0-preview.2.20167.3 + 5.0.0-preview.2.20167.3 + 5.0.0-preview.2.20167.3 + 5.0.0-preview.2.20167.3 + 5.0.0-preview.2.20167.3 + 5.0.0-preview.2.20167.3 0.2.0 From 3689efcdf9aa3495da4e8bef563b85699573563d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 20:56:00 +0000 Subject: [PATCH 29/34] [release/5.0.1xx-preview2] Update dependencies from dotnet/sdk (#6820) * Update dependencies from https://github.com/dotnet/sdk build 20200315.2 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20165.2 - Microsoft.NET.Sdk - 5.0.100-preview.2.20165.2 * Update dependencies from https://github.com/dotnet/sdk build 20200316.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20166.1 - Microsoft.NET.Sdk - 5.0.100-preview.2.20166.1 * Update dependencies from https://github.com/dotnet/sdk build 20200317.1 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20167.1 - Microsoft.NET.Sdk - 5.0.100-preview.2.20167.1 Co-authored-by: dotnet-maestro[bot] --- 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 c4922e3b8..7f74dbfca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating bd8fc17967503221519906c76546192e14fcdfa8 - + https://github.com/dotnet/sdk - fc4c4f57d332059da403bdbe3897fd809c926d8a + 25dd535337270e17c2f7476d73bdb56cc527637e - + https://github.com/dotnet/sdk - fc4c4f57d332059da403bdbe3897fd809c926d8a + 25dd535337270e17c2f7476d73bdb56cc527637e diff --git a/eng/Versions.props b/eng/Versions.props index d92abe2f6..b7ffde448 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20162.8 - 5.0.100-preview.2.20162.8 + 5.0.100-preview.2.20167.1 + 5.0.100-preview.2.20167.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c238263860e69f9d8caacfa8af15322dc9c07a48 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 17 Mar 2020 15:51:02 -0700 Subject: [PATCH 30/34] Disable tests for rolling forward to latest version These tests only catch issues after a patch has been publicly released, and fail if we try to update the implicit versions before then --- .../GivenSelfContainedAppsRollForward.cs | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs index 6b85a2400..0b6dd8898 100644 --- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs +++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs @@ -16,40 +16,6 @@ namespace EndToEnd { public partial class GivenSelfContainedAppsRollForward : TestBase { - - [Theory] - // MemberData is used instead of InlineData here so we can access it in another test to - // verify that we are covering the latest release of .NET Core - [ClassData(typeof(SupportedNetCoreAppVersions))] - public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion) - { - if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0") - { - // https://github.com/dotnet/core-sdk/issues/621 - return; - } - ItRollsForwardToTheLatestVersion(TestProjectCreator.NETCorePackageName, minorVersion); - } - - [Theory] - [ClassData(typeof(SupportedAspNetCoreVersions))] - public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion) - { - if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0") - { - // https://github.com/dotnet/core-sdk/issues/621 - return; - } - ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAppPackageName, minorVersion); - } - - [Theory] - [ClassData(typeof(SupportedAspNetCoreAllVersions))] - public void ItRollsForwardToTheLatestAspNetCoreAllVersion(string minorVersion) - { - ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAllPackageName, minorVersion); - } - internal void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion) { var testProjectCreator = new TestProjectCreator() From 2ae6963438b79546062443365954017f9bf8c70c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 06:35:59 +0000 Subject: [PATCH 31/34] Update dependencies from https://github.com/dotnet/sdk build 20200317.7 (#6847) - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.2.20167.7 - Microsoft.NET.Sdk - 5.0.100-preview.2.20167.7 Co-authored-by: dotnet-maestro[bot] --- 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 7f74dbfca..f7e582476 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,13 +83,13 @@ https://github.com/dotnet/templating bd8fc17967503221519906c76546192e14fcdfa8 - + https://github.com/dotnet/sdk - 25dd535337270e17c2f7476d73bdb56cc527637e + 4f4c12ceabf0b8bdc36c52fe106a9f6f0f65b33e - + https://github.com/dotnet/sdk - 25dd535337270e17c2f7476d73bdb56cc527637e + 4f4c12ceabf0b8bdc36c52fe106a9f6f0f65b33e diff --git a/eng/Versions.props b/eng/Versions.props index b7ffde448..51ae021e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,8 +49,8 @@ - 5.0.100-preview.2.20167.1 - 5.0.100-preview.2.20167.1 + 5.0.100-preview.2.20167.7 + 5.0.100-preview.2.20167.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0d8d4288aca96be3c045125b06a16c18563eb0b9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 19 Mar 2020 09:52:31 +0100 Subject: [PATCH 32/34] Update web templates for preview2 (#6860) * Update web templates for preview2 Updating the web templates to a pinned version for preview2 until https://github.com/dotnet/aspnetcore/pull/19860 is resolved. --- src/redist/targets/BundledTemplates.targets | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index bdc8462e9..ae1870c4d 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -57,8 +57,9 @@ - - + + + From cfbb4fa36f07ac1b3e620500fe92632fef7898db Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 24 Mar 2020 18:39:45 +0100 Subject: [PATCH 33/34] Revert "Update web templates for preview2 (#6860)" (#6902) This reverts commit 0d8d4288aca96be3c045125b06a16c18563eb0b9. --- src/redist/targets/BundledTemplates.targets | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index ae1870c4d..bdc8462e9 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -57,9 +57,8 @@ - - - + + From f0e4bbe47b5701d802f00506f1cc4bccb0018a34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 02:24:00 +0000 Subject: [PATCH 34/34] Update dependencies from https://github.com/dotnet/templating build 20200324.1 (#6905) - Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.2.20174.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Daniel Plaisted --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7e582476..228c4410f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,9 +79,9 @@ https://github.com/dotnet/test-templates e8e924b5937e75ab3049d57cb5fb196ea2e3332c - + https://github.com/dotnet/templating - bd8fc17967503221519906c76546192e14fcdfa8 + 7e732bccfebe0cf51138d4368b98c2ab11e168f7 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index 51ae021e0..efa9fb4fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ - 5.0.0-preview.2.20164.4 + 5.0.0-preview.2.20174.1