diff --git a/NuGet.config b/NuGet.config index 574b03469..8d760329e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c6422cc0..bb71520da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,24 +2,24 @@ - https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e - - https://github.com/dotnet/core-setup - 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 + + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup + a1388f194c30cb21b36b75982962cb5e35954e4e @@ -45,25 +45,25 @@ https://github.com/aspnet/AspNetCore 2b7e994b8a304700a09617ffc5052f0d943bbcba - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db - - https://github.com/aspnet/AspNetCore - 2b7e994b8a304700a09617ffc5052f0d943bbcba + + https://dev.azure.com/dnceng/internal/_git/aspnet-AspNetCore + e276c8174b8bfdeb70efceafa81c75f8badbc8db https://github.com/dotnet/test-templates @@ -86,13 +86,13 @@ cbf29e13514ba9d3be54eff7ccfe4b9df93e581b - + https://github.com/dotnet/winforms - 4bcd68c8b29476fc3c5ca1b496214584aadfdc84 + 9483a88b7764a74d71cbd449de6c56c1d5e0af21 - - https://github.com/dotnet/wpf - 427fa56aed34cbbc5096aa6137e748054905507d + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + a8e48616c8d8e56469a456eb1ee263268316b827 diff --git a/eng/Versions.props b/eng/Versions.props index 72bde6cc2..5eb1fdd8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.1-rtm.19564.4 + 4.8.1-servicing.19605.5 - 3.1.0-rtm.19565.1 + 3.1.0-rtm.19605.7 @@ -36,12 +36,12 @@ - 3.1.0 + 3.1.1 3.1.0 - 3.1.0-rtm.19566.1 - 3.1.0-rtm.19566.1 - 3.1.0-rtm.19566.1 - 3.1.0-rtm.19566.1 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 + 3.1.1-servicing.19615.10 @@ -61,12 +61,12 @@ - 3.1.0-rtm.19565.2 - 3.1.0 - 3.1.0 + 3.1.1-servicing.19608.4 + 3.1.1 + 3.1.1 3.1.0 - 3.1.0 - 3.1.0 + 3.1.1 + 3.1.1 3.1.0 2.1.0 diff --git a/eng/build.yml b/eng/build.yml index 750111576..82a75e27a 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -73,6 +73,14 @@ phases: - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - script: 'eng\setbuildinfo.bat $(_BuildArchitecture) $(_BuildConfig)' displayName: Set test info (Windows) + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: build.cmd $(TestParameter) -pack -publish -ci @@ -90,6 +98,14 @@ phases: - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: - script: 'eng/setbuildinfo.sh $(_BuildArchitecture) $(_BuildConfig)' displayName: Set test info (Non-Windows) + - ${{ if ne(variables['System.TeamProject'], 'public') }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Linux') }}: - script: ./build.sh $(TestParameter) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 66af4016c..a214842a0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -14,11 +14,11 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NETCoreApp30RuntimePackVersion>3.0.1 + <_NETCoreApp30RuntimePackVersion>3.0.2 <_NETCoreApp30TargetingPackVersion>3.0.0 - <_WindowsDesktop30RuntimePackVersion>3.0.1 + <_WindowsDesktop30RuntimePackVersion>3.0.2 <_WindowsDesktop30TargetingPackVersion>3.0.0 - <_AspNet30RuntimePackVersion>3.0.1 + <_AspNet30RuntimePackVersion>3.0.2 <_AspNet30TargetingPackVersion>3.0.1 @@ -155,7 +155,7 @@ Copyright (c) .NET Foundation. All rights reserved. - $(VSRedistCommonAspNetCoreTargetingPackx6431PackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) $(MicrosoftNETCoreAppInternalPackageVersion) diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets index 1156ea7db..64a307af6 100644 --- a/src/redist/targets/Versions.targets +++ b/src/redist/targets/Versions.targets @@ -8,7 +8,7 @@ - false + true diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 958b52b30..a1bbf00f4 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -155,6 +155,11 @@ Skip="true" Issue="" Reason="Needs .NET Core 2.1.15"/> + +