diff --git a/NuGet.config b/NuGet.config index f216cef74..4bc7f424f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,13 @@ + + + + + diff --git a/README.md b/README.md index 8089a0b50..7ab2b36cc 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ This project has adopted the code of conduct defined by the [Contributor Covenan |:------:| |[![Build Status](https://dev.azure.com/dnceng/internal/_apis/build/status/286)](https://dev.azure.com/dnceng/internal/_build?definitionId=286)| - Installers and Binaries ----------------------- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec3f05385..99e6b5386 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,25 +1,25 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 - - https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - a1388f194c30cb21b36b75982962cb5e35954e4e + + https://github.com/dotnet/core-setup + 916b5cba268e1e1e803243004f4276cf40b2dda8 @@ -41,62 +41,62 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/aspnet/AspNetCore 92409e2e57b320f9728de62fba2c82168761f9cc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - - https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore - e276c8174b8bfdeb70efceafa81c75f8badbc8db + + https://github.com/dotnet/aspnetcore + c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc - + https://github.com/dotnet/test-templates - 5117d3d9d7dfd3583f0c42a639efaf092f957b7b + 07c739a22eeb760e60322ac0989c998328fe0aa2 - + https://github.com/dotnet/templating - 13abe7e2749d95337e8d72efdc5b71611815fd43 + 247f60e9e34a03ed99e855eb1ea0c20931a968db - + https://github.com/dotnet/toolset - 10b58218b32345dd2daac5aff6b7d2b5e72312e1 + 74b6cb39036b54bf3f0fac90c00eac8b9aa4b0df - + https://github.com/dotnet/sdk - 130be5a782f6fa8410627a8fddd3e2988bde1c71 + 1a75f83011dccb47a8b9689704b961a0bf09ca14 - + https://github.com/dotnet/cli - ce7027083cc440b7d9715b5d3ea73ac3f2069c22 + a47ca8f97e48fd858e0ee2aaab05c11f0c9bda1a https://github.com/dotnet/winforms 9483a88b7764a74d71cbd449de6c56c1d5e0af21 - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - a8e48616c8d8e56469a456eb1ee263268316b827 + + https://github.com/dotnet/wpf + 589ace3c9fdfa0f1ea1640b82304a6a7ac597871 @@ -106,9 +106,9 @@ - + https://github.com/dotnet/arcade - 4d80b9cfa53e309c8f685abff3512f60c3d8a3d1 + 15f00efd583eab4372b2e9ca25bd80ace5b119ad diff --git a/eng/Versions.props b/eng/Versions.props index 545ef5a21..bd0c90aee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ preview - 3.1.200-preview.20108.3 + 3.1.300-preview.20160.1 @@ -20,15 +20,15 @@ - 3.1.0-rtm.19605.7 + 3.1.2-servicing.20066.4 - 3.1.1-servicing.19605.2 + 3.1.2 - 1.0.2-beta4.20105.2 + 1.0.2-beta4.20079.1 @@ -36,24 +36,24 @@ - 3.1.1 - 3.1.0 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 - 3.1.1-servicing.19615.10 - 3.2.0-preview2.20118.6 + 3.1.2 + 3.1.2 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 + 3.1.2-servicing.20068.1 + 3.2.0-preview2.20160.5 - 3.1.200-preview.20107.2 + 3.1.200-preview.20126.2 0.2.0 - 3.1.200-preview.20107.4 + 3.1.200-preview.20126.2 $(MicrosoftNETSdkPackageVersion) @@ -62,12 +62,12 @@ - 3.1.1-servicing.19608.4 - 3.1.1 - 3.1.1 + 3.1.2-servicing.20067.4 + 3.1.2 + 3.1.2 3.1.0 - 3.1.1 - 3.1.1 + 3.1.2 + 3.1.2 3.1.0 2.1.0 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 46d175fdf..b94c2f4e4 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -27,7 +27,7 @@ function InstallDarcCli ($darcVersion) { Write-Host "Installing Darc CLI version $darcVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g + & "$dotnet" tool install $darcCliPackageName --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g --framework netcoreapp2.1 } InstallDarcCli $darcVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index b121d77e0..3c69186f0 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -341,4 +341,28 @@ stages: channelId: 557 transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Publishing' + channelName: '.NET Core SDK 3.1.3xx' + channelId: 759 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-internal-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'NETCore_SDK_313xx_Internal_Publishing' + channelName: '.NET Core SDK 3.1.3xx Internal' + channelId: 760 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json' \ No newline at end of file diff --git a/global.json b/global.json index 84f775a7a..2c321daa9 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.1.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19607.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20113.5" } } diff --git a/src/CopyToLatest/targets/BranchInfo.props b/src/CopyToLatest/targets/BranchInfo.props index e67ccd9d2..ac492e904 100644 --- a/src/CopyToLatest/targets/BranchInfo.props +++ b/src/CopyToLatest/targets/BranchInfo.props @@ -1,5 +1,5 @@ - release/3.1.2xx + release/3.1.3xx diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index a214842a0..45a3461c5 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -14,11 +14,11 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NETCoreApp30RuntimePackVersion>3.0.2 + <_NETCoreApp30RuntimePackVersion>3.0.3 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_WindowsDesktop30RuntimePackVersion>3.0.2 + <_WindowsDesktop30RuntimePackVersion>3.0.3 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_AspNet30RuntimePackVersion>3.0.2 + <_AspNet30RuntimePackVersion>3.0.3 <_AspNet30TargetingPackVersion>3.0.1 @@ -92,7 +92,7 @@ + LatestVersion="2.1.16" /> + LatestVersion="2.1.16"/> + LatestVersion="2.1.16"/> 3.1.0-rtm.19565.2 - 3.1.0 + 3.1.2-servicing.20068.1 3.1.0-rtm.19565.2 3.0.0 diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 1156ea7db..4ae516342 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -2,7 +2,7 @@ 3 1 - 2 + 3 00 preview