Merge pull request #10866 from vseanreesermsft/internal-merge-5.0.3xx-2021-06-08-1100
Merging internal commits for release/5.0.3xx
This commit is contained in:
William Godbe
GitHub
commit
09c87f0b54
20 changed files with 244 additions and 176 deletions
|
|
@ -5,13 +5,13 @@
|
|||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>ec2af60c1eb8b2665745750f6445b3ff133178fb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.6-servicing.21221.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.7-servicing.21263.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>297185fc6039237591fb28a8a09fc01d2ea69ae6</Sha>
|
||||
<Sha>f87455227b7f349e26043daa2e1b5b86fb381627</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
|
||||
<Sha>297185fc6039237591fb28a8a09fc01d2ea69ae6</Sha>
|
||||
<Sha>f87455227b7f349e26043daa2e1b5b86fb381627</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.5.0" Version="5.0.0-rtm.20520.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
|
|
@ -21,21 +21,21 @@
|
|||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.6-servicing.21220.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.7-servicing.21255.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha>
|
||||
<Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha>
|
||||
<Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="5.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha>
|
||||
<Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="5.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||
<Sha>478b2f8c0e480665f6c52c95cd57830784dc9560</Sha>
|
||||
<Sha>556582d964cc21b82a88d7154e915076f6f9008e</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -55,25 +55,25 @@
|
|||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>371a26f07b23ad77c636332c2dfc0cbd1d8137ba</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>dc5e11abdb05b322f4b74b3afbcfb352fe984b2e</Sha>
|
||||
<Sha>67acc3d331454956fc06d6de2218a625e3e596f8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.6-servicing.21223.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.5.0" Version="5.0.7-servicing.21263.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>dc5e11abdb05b322f4b74b3afbcfb352fe984b2e</Sha>
|
||||
<Sha>67acc3d331454956fc06d6de2218a625e3e596f8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.7" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/efcore</Uri>
|
||||
<Sha>42e81439158d5884dab24326c84ed95cd4baaa21</Sha>
|
||||
<Sha>f8a6198dad41e8ed584da6ff711837f3288f8a8d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="5.0.6-servicing.21223.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="5.0.7-servicing.21263.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>dc5e11abdb05b322f4b74b3afbcfb352fe984b2e</Sha>
|
||||
<Sha>67acc3d331454956fc06d6de2218a625e3e596f8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="5.0.6-servicing.21223.5" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="5.0.7-servicing.21263.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
|
||||
<Sha>dc5e11abdb05b322f4b74b3afbcfb352fe984b2e</Sha>
|
||||
<Sha>67acc3d331454956fc06d6de2218a625e3e596f8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21268.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -87,43 +87,43 @@
|
|||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>592742371da1df5b459c4bbf68e05968b5eb750d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.301-servicing.21269.13">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>23b56ae2930ab04967d59485533230e97fe3c34a</Sha>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.301-servicing.21271.7">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>1555c5a76cb15abb5350aeeffc63d83c3fd2f70f</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.301-servicing.21269.13">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>23b56ae2930ab04967d59485533230e97fe3c34a</Sha>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.301-servicing.21271.7">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
|
||||
<Sha>1555c5a76cb15abb5350aeeffc63d83c3fd2f70f</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.6-servicing.21221.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.7-servicing.21263.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
|
||||
<Sha>3b86fe34ae2ef405a49c19997f9f01ed63a2ad70</Sha>
|
||||
<Sha>3e5e4f7ca852c8b85899a18efcd114e7ed4ea163</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.6-servicing.21221.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.6-servicing.21263.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>fe9dd395134709b5a53883b71c01447b5f132a06</Sha>
|
||||
<Sha>36ec7266b65ec578b5524c998a80e6a8848efb41</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.4.2-beta.21262.7" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>1b23bbeda88ea3cb9be9af777f4c99fa8663df81</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.10.0-release-20210511-06" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.10.0-release-20210520-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>9b8fac9e1dd2a1a1d7604ec38df6a8b1002c516e</Sha>
|
||||
<Sha>5c9abb2ae1b0318dc52729a3639e72089c79fb3c</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21221.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/mono/linker</Uri>
|
||||
<Sha>6a15056a9d71169bf04d007301edfd558afcfa6a</Sha>
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-4.21262.12" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-4.21269.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>dc0aff25e0ace6e6bf98269963612f9a67cdc897</Sha>
|
||||
<Sha>029847714208ebe49668667c60ea5b0a294e0fcb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="16.10.0" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="16.10.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>4242f381a90f77f483b123819759db1ff8eddf67</Sha>
|
||||
<Sha>2fd48ab730134f7698a14fdd5752349737f0e3bd</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="5.10.0-rc.7240" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.6-servicing.21221.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.7-servicing.21263.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.6-servicing.21221.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.6-servicing.21263.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
|
|
@ -43,20 +43,20 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>5.0.7</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>5.0.0</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>5.0.0-rtm.20526.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>5.0.6-servicing.21223.5</VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>5.0.6-servicing.21223.5</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>5.0.6-servicing.21223.5</dotnetusersecretsPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>5.0.7-servicing.21263.9</VSRedistCommonAspNetCoreSharedFrameworkx6450PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>5.0.7-servicing.21263.9</dotnetdevcertsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>5.0.7-servicing.21263.9</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>5.0.301-servicing.21269.13</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.301-servicing.21269.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>5.0.301-servicing.21271.7</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.301-servicing.21271.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -67,17 +67,17 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.6-servicing.21220.11</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.6</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppInternalPackageVersion>5.0.7-servicing.21255.8</MicrosoftNETCoreAppInternalPackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>5.0.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.6</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>5.0.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.6-servicing.21221.6</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.7-servicing.21263.4</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.7</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>5.0.0-rtm.20520.1</VSRedistCommonWindowsDesktopTargetingPackx6450PackageVersion>
|
||||
</PropertyGroup>
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>16.10.0-release-20210511-06</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>16.10.0-release-20210520-03</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
|
||||
|
|
|
|||
|
|
@ -43,10 +43,14 @@ phases:
|
|||
- _SignType: test
|
||||
- _BuildArgs: '/p:DotNetSignType=$(_SignType)'
|
||||
- _DOTNETCLIMSRC_READ_SAS_TOKEN: ''
|
||||
- _InternalRuntimeDownloadArgs: ''
|
||||
|
||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
- group: DotNet-MSRC-Storage
|
||||
- _DOTNETCLIMSRC_READ_SAS_TOKEN: $(dotnetclimsrc-read-sas-token)
|
||||
- name: _InternalRuntimeDownloadArgs
|
||||
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
|
||||
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
|
||||
|
||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||
- group: DotNet-Symbol-Server-PATs
|
||||
|
|
@ -81,6 +85,7 @@ phases:
|
|||
-Architecture $(_BuildArchitecture)
|
||||
$(_BuildArgs)
|
||||
$(_AdditionalBuildParameters)
|
||||
$(_InternalRuntimeDownloadArgs)
|
||||
displayName: Build
|
||||
env:
|
||||
DOTNET_CLI_UI_LANGUAGE: $(_DOTNET_CLI_UI_LANGUAGE)
|
||||
|
|
@ -107,6 +112,7 @@ phases:
|
|||
$(_RuntimeIdentifier)
|
||||
$(_BuildArgs)
|
||||
$(_AdditionalBuildParameters)
|
||||
$(_InternalRuntimeDownloadArgs)
|
||||
displayName: Build
|
||||
env:
|
||||
DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN)
|
||||
|
|
@ -119,6 +125,7 @@ phases:
|
|||
--configuration $(_BuildConfig)
|
||||
$(_BuildArgs)
|
||||
$(_AdditionalBuildParameters)
|
||||
$(_InternalRuntimeDownloadArgs)
|
||||
displayName: Build
|
||||
env:
|
||||
DOTNETCLIMSRC_READ_SAS_TOKEN: $(_DOTNETCLIMSRC_READ_SAS_TOKEN)
|
||||
|
|
|
|||
|
|
@ -158,4 +158,9 @@ if ($dotnet5Source -ne $null) {
|
|||
AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
||||
}
|
||||
|
||||
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
|
||||
if ($dotnetToolsSource -ne $null) {
|
||||
AddPackageSource -Sources $sources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
||||
}
|
||||
|
||||
$doc.Save($filename)
|
||||
|
|
|
|||
|
|
@ -129,6 +129,20 @@ if [ "$?" == "0" ]; then
|
|||
PackageSources+=('dotnet5-internal-transport')
|
||||
fi
|
||||
|
||||
# Ensure dotnet-tools-internal is in the packageSources if the public dotnet-tools feed is present
|
||||
grep -i "<add key=\"dotnet-tools\"" $ConfigFile
|
||||
if [ "$?" == "0" ]; then
|
||||
grep -i "<add key=\"dotnet-tools-internal\"" $ConfigFile
|
||||
if [ "$?" != "0" ]; then
|
||||
echo "Adding dotnet-tools-internal to the packageSources."
|
||||
PackageSourcesNodeFooter="</packageSources>"
|
||||
PackageSourceTemplate="${TB}<add key=\"dotnet-tools-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v2\" />"
|
||||
|
||||
sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
|
||||
fi
|
||||
PackageSources+=('dotnet-tools-internal')
|
||||
fi
|
||||
|
||||
# I want things split line by line
|
||||
PrevIFS=$IFS
|
||||
IFS=$'\n'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue