Skip to content

Commit e0950fb

Browse files
dotnet-botdotnet-bot
committed
Merge pull request 4766 from darc-internal/release/3.1-4ef6a02e-3deb-4f33-bf42-cd9a94bbc492 into internal/release/3.1
1 parent 813358a commit e0950fb

File tree

4 files changed

+83
-50
lines changed

4 files changed

+83
-50
lines changed

‎NuGet.config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
<add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
77
<add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
88
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-core-setup-a1388f1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-core-setup-a1388f19/nuget/v3/index.json" />
910
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1011
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1112
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
1213
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
13-
<add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
14-
<add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
14+
<add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
15+
<add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
1516
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
1617
</packageSources>
1718
</configuration>

‎azure-pipelines.yml‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ variables:
1313
value: https://localhost:8081
1414
- name: _CosmosToken
1515
value: C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
16+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
17+
- group: DotNet-MSRC-Storage
18+
- name: _InternalRuntimeDownloadArgs
19+
value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
20+
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
21+
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
22+
- name: _InternalRuntimeDownloadArgs
23+
value: ''
1624

1725
# used for post-build phases, internal builds only
1826
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -69,7 +77,15 @@ stages:
6977
- script: "echo ##vso[build.addbuildtag]release-candidate"
7078
condition: and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['IsFinalBuild'], 'true'))
7179
displayName: 'Set CI tags'
72-
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_InternalBuildArgs)
80+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
81+
- task: PowerShell@2
82+
displayName: Setup Private Feeds Credentials
83+
inputs:
84+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
85+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
86+
env:
87+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
88+
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_InternalBuildArgs) $(_InternalRuntimeDownloadArgs)
7389
env:
7490
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
7591
name: Build
@@ -99,7 +115,15 @@ stages:
99115
- bash: brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/835ae521c065524abdf66578e68032fa24bce514/Formula/libspatialite.rb
100116
displayName: Install SpatiaLite
101117
continueOnError: true
102-
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --binaryLog --prepareMachine
118+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
119+
- task: Bash@3
120+
displayName: Setup Private Feeds Credentials
121+
inputs:
122+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
123+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
124+
env:
125+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
126+
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --binaryLog --prepareMachine $(_InternalRuntimeDownloadArgs)
103127
env:
104128
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
105129
name: Build
@@ -134,8 +158,16 @@ stages:
134158
echo "##vso[task.setvariable variable=_CosmosToken]$(ef-pr-cosmos-test)"
135159
displayName: Prepare to run Cosmos tests on ef-pr-test
136160
condition: and(eq(variables['_CosmosConnectionUrl'], 'true'), or(endsWith(variables['Build.BuildId'], '1'), endsWith(variables['Build.BuildId'], '3'), endsWith(variables['Build.BuildId'], '5'), endsWith(variables['Build.BuildId'], '7'), endsWith(variables['Build.BuildId'], '9')))
137-
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine
138-
env:
161+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
162+
- task: Bash@3
163+
displayName: Setup Private Feeds Credentials
164+
inputs:
165+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
166+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
167+
env:
168+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
169+
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
170+
env:
139171
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
140172
Test__Cosmos__AuthToken: $(_CosmosToken)
141173
name: Build

‎eng/Version.Details.xml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,49 @@
1313
<Uri>https://github.com/dotnet/corefx</Uri>
1414
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.1.1-servicing.19576.9" CoherentParentDependency="Microsoft.Extensions.Logging">
17-
<Uri>https://github.com/dotnet/core-setup</Uri>
18-
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
16+
<Dependency Name="Microsoft.DotNet.PlatformAbstractions" Version="3.1.1" CoherentParentDependency="Microsoft.Extensions.Logging">
17+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
18+
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.1.1-servicing.19604.6">
21-
<Uri>https://github.com/aspnet/Extensions</Uri>
22-
<Sha>d40e21ccc14908a054b2181b1d6aeb22c49c630d</Sha>
20+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.1.1-servicing.19610.3">
21+
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions</Uri>
22+
<Sha>381bf42d003e8fae25e1b6843ad87816b029ce27</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.1-servicing.19604.6">
25-
<Uri>https://github.com/aspnet/Extensions</Uri>
26-
<Sha>d40e21ccc14908a054b2181b1d6aeb22c49c630d</Sha>
24+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.1-servicing.19610.3">
25+
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions</Uri>
26+
<Sha>381bf42d003e8fae25e1b6843ad87816b029ce27</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.1.1-servicing.19604.6">
29-
<Uri>https://github.com/aspnet/Extensions</Uri>
30-
<Sha>d40e21ccc14908a054b2181b1d6aeb22c49c630d</Sha>
28+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.1.1-servicing.19610.3">
29+
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions</Uri>
30+
<Sha>381bf42d003e8fae25e1b6843ad87816b029ce27</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.Configuration" Version="3.1.1-servicing.19604.6">
33-
<Uri>https://github.com/aspnet/Extensions</Uri>
34-
<Sha>d40e21ccc14908a054b2181b1d6aeb22c49c630d</Sha>
32+
<Dependency Name="Microsoft.Extensions.Configuration" Version="3.1.1-servicing.19610.3">
33+
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions</Uri>
34+
<Sha>381bf42d003e8fae25e1b6843ad87816b029ce27</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.1.1-servicing.19604.6">
37-
<Uri>https://github.com/aspnet/Extensions</Uri>
38-
<Sha>d40e21ccc14908a054b2181b1d6aeb22c49c630d</Sha>
36+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.1.1-servicing.19610.3">
37+
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions</Uri>
38+
<Sha>381bf42d003e8fae25e1b6843ad87816b029ce27</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.1-servicing.19576.9" CoherentParentDependency="Microsoft.Extensions.Logging">
41-
<Uri>https://github.com/dotnet/core-setup</Uri>
42-
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
40+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.1.1" CoherentParentDependency="Microsoft.Extensions.Logging">
41+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
42+
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.1-servicing.19604.6">
45-
<Uri>https://github.com/aspnet/Extensions</Uri>
46-
<Sha>d40e21ccc14908a054b2181b1d6aeb22c49c630d</Sha>
44+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.1.1-servicing.19610.3">
45+
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions</Uri>
46+
<Sha>381bf42d003e8fae25e1b6843ad87816b029ce27</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.1-servicing.19604.6">
49-
<Uri>https://github.com/aspnet/Extensions</Uri>
50-
<Sha>d40e21ccc14908a054b2181b1d6aeb22c49c630d</Sha>
48+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.1.1-servicing.19610.3">
49+
<Uri>https://dev.azure.com/dnceng/internal/_git/aspnet-Extensions</Uri>
50+
<Sha>381bf42d003e8fae25e1b6843ad87816b029ce27</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1-servicing.19576.9" CoherentParentDependency="Microsoft.Extensions.Logging">
53-
<Uri>https://github.com/dotnet/core-setup</Uri>
54-
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.1" CoherentParentDependency="Microsoft.Extensions.Logging">
53+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
54+
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19576.9" CoherentParentDependency="Microsoft.Extensions.Logging">
57-
<Uri>https://github.com/dotnet/core-setup</Uri>
58-
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
56+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19608.4" CoherentParentDependency="Microsoft.Extensions.Logging">
57+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
58+
<Sha>a1388f194c30cb21b36b75982962cb5e35954e4e</Sha>
5959
</Dependency>
6060
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
6161
<Uri>https://github.com/dotnet/core-setup</Uri>

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<MicrosoftDataSqlClientPackageVersion>1.0.19269.1</MicrosoftDataSqlClientPackageVersion>
3232
</PropertyGroup>
3333
<PropertyGroup Label="Dependencies from aspnet/Extensions">
34-
<MicrosoftExtensionsCachingMemoryPackageVersion>3.1.1-servicing.19604.6</MicrosoftExtensionsCachingMemoryPackageVersion>
35-
<MicrosoftExtensionsConfigurationPackageVersion>3.1.1-servicing.19604.6</MicrosoftExtensionsConfigurationPackageVersion>
36-
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.1.1-servicing.19604.6</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
37-
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.1.1-servicing.19604.6</MicrosoftExtensionsConfigurationJsonPackageVersion>
38-
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.1.1-servicing.19604.6</MicrosoftExtensionsDependencyInjectionPackageVersion>
39-
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.1-servicing.19604.6</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
40-
<MicrosoftExtensionsLoggingPackageVersion>3.1.1-servicing.19604.6</MicrosoftExtensionsLoggingPackageVersion>
34+
<MicrosoftExtensionsCachingMemoryPackageVersion>3.1.1-servicing.19610.3</MicrosoftExtensionsCachingMemoryPackageVersion>
35+
<MicrosoftExtensionsConfigurationPackageVersion>3.1.1-servicing.19610.3</MicrosoftExtensionsConfigurationPackageVersion>
36+
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.1.1-servicing.19610.3</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
37+
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.1.1-servicing.19610.3</MicrosoftExtensionsConfigurationJsonPackageVersion>
38+
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.1.1-servicing.19610.3</MicrosoftExtensionsDependencyInjectionPackageVersion>
39+
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.1.1-servicing.19610.3</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
40+
<MicrosoftExtensionsLoggingPackageVersion>3.1.1-servicing.19610.3</MicrosoftExtensionsLoggingPackageVersion>
4141
</PropertyGroup>
4242
<PropertyGroup Label="Dependencies from dotnet/corefx">
4343
<MicrosoftBclAsyncInterfacesVersion>1.1.0</MicrosoftBclAsyncInterfacesVersion>
@@ -48,11 +48,11 @@
4848
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.7.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
4949
</PropertyGroup>
5050
<PropertyGroup Label="Dependencies from dotnet/core-setup">
51-
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.1-servicing.19576.9</MicrosoftDotNetPlatformAbstractionsPackageVersion>
52-
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.1-servicing.19576.9</MicrosoftExtensionsDependencyModelPackageVersion>
51+
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.1</MicrosoftDotNetPlatformAbstractionsPackageVersion>
52+
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.1</MicrosoftExtensionsDependencyModelPackageVersion>
5353
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
54-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
55-
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppInternalPackageVersion>
54+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
55+
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19608.4</MicrosoftNETCoreAppInternalPackageVersion>
5656
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
5757
</PropertyGroup>
5858
<PropertyGroup Label="Dependencies from dotnet/roslyn">

0 commit comments

Comments
 (0)