Skip to content

Commit 1b7015c

Browse files
joperezrjoperezr
committed
Merged PR 37906: Flow 8.0.3 dependencies and prepare repo for 8.3 release
Flow 8.0.3 dependencies and prepare repo for 8.3 release
1 parent 52350a9 commit 1b7015c

File tree

7 files changed

+80
-112
lines changed

7 files changed

+80
-112
lines changed

‎Directory.Build.props

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
<TestNetCoreTargetFrameworks>$(NetCoreTargetFrameworks)</TestNetCoreTargetFrameworks>
3535
</PropertyGroup>
3636

37+
<!-- Internal branches don't use package source mapping feature due to internal feeds, so disable NU1507 warning saying it should be used. -->
38+
<PropertyGroup>
39+
<NoWarn>$(NoWarn);NU1507</NoWarn>
40+
</PropertyGroup>
41+
3742
<PropertyGroup>
3843
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
3944
<LangVersion>latest</LangVersion>

‎NuGet.config

+12-22
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7+
<add key="darc-int-dotnet-aspnetcore-88ec3bc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-88ec3bc3/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-aspnetcore-88ec3bc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-88ec3bc3-2/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-aspnetcore-88ec3bc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-88ec3bc3-1/nuget/v3/index.json" />
710
<!-- End: Package sources from dotnet-aspnetcore -->
811
<!-- Begin: Package sources from dotnet-runtime -->
12+
<add key="darc-int-dotnet-runtime-9f4b1f5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9f4b1f5d/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-runtime-9f4b1f5-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9f4b1f5d-2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-runtime-9f4b1f5-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9f4b1f5d-1/nuget/v3/index.json" />
915
<!-- End: Package sources from dotnet-runtime -->
1016
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1117
<!-- Arcade -->
@@ -17,33 +23,17 @@
1723
<!-- Used for the Rich Navigation indexing task -->
1824
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1925
</packageSources>
20-
<!-- Define mappings by adding package patterns beneath the target source.
21-
https://aka.ms/nuget-package-source-mapping -->
22-
<packageSourceMapping>
23-
<packageSource key="dotnet-public">
24-
<package pattern="*" />
25-
</packageSource>
26-
<packageSource key="dotnet-eng">
27-
<package pattern="*" />
28-
</packageSource>
29-
<packageSource key="dotnet-tools">
30-
<package pattern="*" />
31-
</packageSource>
32-
<packageSource key="dotnet8">
33-
<package pattern="*" />
34-
</packageSource>
35-
<packageSource key="dotnet8-transport">
36-
<package pattern="*" />
37-
</packageSource>
38-
<packageSource key="richnav">
39-
<package pattern="*" />
40-
</packageSource>
41-
</packageSourceMapping>
4226
<disabledPackageSources>
4327
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4428
<!-- Begin: Package sources from dotnet-aspnetcore -->
29+
<add key="darc-int-dotnet-aspnetcore-88ec3bc-1" value="true" />
30+
<add key="darc-int-dotnet-aspnetcore-88ec3bc-2" value="true" />
31+
<add key="darc-int-dotnet-aspnetcore-88ec3bc" value="true" />
4532
<!-- End: Package sources from dotnet-aspnetcore -->
4633
<!-- Begin: Package sources from dotnet-runtime -->
34+
<add key="darc-int-dotnet-runtime-9f4b1f5-1" value="true" />
35+
<add key="darc-int-dotnet-runtime-9f4b1f5-2" value="true" />
36+
<add key="darc-int-dotnet-runtime-9f4b1f5" value="true" />
4737
<!-- End: Package sources from dotnet-runtime -->
4838
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4939
</disabledPackageSources>

‎azure-pipelines.yml

-50
Original file line numberDiff line numberDiff line change
@@ -206,55 +206,6 @@ stages:
206206
warnAsError: 0
207207

208208

209-
# ----------------------------------------------------------------
210-
# This stage performs quality gates enforcements
211-
# ----------------------------------------------------------------
212-
- stage: codecoverage
213-
displayName: CodeCoverage
214-
dependsOn:
215-
- build
216-
condition: and(succeeded('build'), ne(variables['SkipQualityGates'], 'true'))
217-
variables:
218-
- template: /eng/common/templates/variables/pool-providers.yml
219-
jobs:
220-
- template: /eng/common/templates/jobs/jobs.yml
221-
parameters:
222-
enableMicrobuild: true
223-
enableTelemetry: true
224-
runAsPublic: ${{ variables['runAsPublic'] }}
225-
workspace:
226-
clean: all
227-
228-
# ----------------------------------------------------------------
229-
# This stage downloads the code coverage reports from the build jobs,
230-
# merges those and validates the combined test coverage.
231-
# ----------------------------------------------------------------
232-
jobs:
233-
- job: CodeCoverageReport
234-
timeoutInMinutes: 180
235-
236-
pool:
237-
${{ if eq(variables['runAsPublic'], 'true') }}:
238-
name: $(DncEngPublicBuildPool)
239-
demands: ImageOverride -equals build.ubuntu.2004.amd64.open
240-
# Non-public (i.e., official builds)
241-
${{ else }}:
242-
name: $(DncEngInternalBuildPool)
243-
demands: ImageOverride -equals build.ubuntu.2004.amd64
244-
245-
preSteps:
246-
- checkout: self
247-
clean: true
248-
persistCredentials: true
249-
fetchDepth: 1
250-
251-
steps:
252-
- script: $(Build.SourcesDirectory)/build.sh --ci --restore
253-
displayName: Init toolset
254-
255-
- template: /eng/pipelines/templates/VerifyCoverageReport.yml
256-
257-
258209
# ----------------------------------------------------------------
259210
# This stage only performs a build treating warnings as errors
260211
# to detect any kind of code style violations
@@ -313,7 +264,6 @@ stages:
313264
parameters:
314265
validateDependsOn:
315266
- build
316-
- codecoverage
317267
- correctness
318268
publishingInfraVersion: 3
319269
enableSymbolValidation: false

‎eng/Version.Details.xml

+25-25
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3333
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
35+
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
3636
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
37-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
37+
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
3838
</Dependency>
3939
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
4040
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -56,9 +56,9 @@
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5757
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
59+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
6060
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
61-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
61+
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
6262
</Dependency>
6363
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
6464
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -82,7 +82,7 @@
8282
</Dependency>
8383
<Dependency Name="Microsoft.Extensions.Options" Version="8.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
8484
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
85-
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
85+
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
8686
</Dependency>
8787
<Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
8888
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -124,49 +124,49 @@
124124
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
125125
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
126126
</Dependency>
127-
<Dependency Name="System.Text.Json" Version="8.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
127+
<Dependency Name="System.Text.Json" Version="8.0.3" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
128128
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
129-
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
129+
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
130130
</Dependency>
131131
<Dependency Name="System.Runtime.Caching" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
132132
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
133133
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
134134
</Dependency>
135-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.2">
135+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.3">
136136
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
137-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
137+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
138138
</Dependency>
139-
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2">
139+
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3">
140140
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
141-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
141+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
142142
</Dependency>
143-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.2">
143+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.3">
144144
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
145-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
145+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
146146
</Dependency>
147-
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.2">
147+
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.3">
148148
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
149-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
149+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
150150
</Dependency>
151-
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.2">
151+
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.3">
152152
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
153-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
153+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
154154
</Dependency>
155-
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2">
155+
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3">
156156
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
157-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
157+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.Extensions.Features" Version="8.0.2">
159+
<Dependency Name="Microsoft.Extensions.Features" Version="8.0.3">
160160
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
161-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
161+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.2">
163+
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.3">
164164
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
165-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
165+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.2">
167+
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.3">
168168
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
169-
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
169+
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
170170
</Dependency>
171171
</ProductDependencies>
172172
<ToolsetDependencies>

‎eng/Versions.props

+17-14
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
<MajorVersion>8</MajorVersion>
44
<MinorVersion>3</MinorVersion>
55
<PatchVersion>0</PatchVersion>
6-
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
6+
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
77
<PreReleaseVersionIteration>
88
</PreReleaseVersionIteration>
99
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1010
<ValidateBaseline>true</ValidateBaseline>
1111
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
1212
<!--
1313
When DotNetFinalVersionKind is set to 'release', this branch will produce stable outputs for 'Shipping' packages
14+
15+
In 8.0, we shipped this package as stable even when it was in the dev stage, so we
16+
keep it as stable for compatiblity.
1417
-->
15-
<DotNetFinalVersionKind />
18+
<DotNetFinalVersionKind Condition="'$(DotNetFinalVersionKind)' == '' And ('$(Stage)' != 'dev' Or '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.Testing')">release</DotNetFinalVersionKind>
1619
<!-- Enabling this rule will cause build failures on undocumented public APIs. -->
1720
<SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
1821
</PropertyGroup>
@@ -36,13 +39,13 @@
3639
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0</MicrosoftExtensionsConfigurationCommandLineVersion>
3740
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0</MicrosoftExtensionsConfigurationJsonVersion>
3841
<MicrosoftExtensionsConfigurationVersion>8.0.0</MicrosoftExtensionsConfigurationVersion>
39-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
42+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
4043
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
4144
<MicrosoftExtensionsDiagnosticsVersion>8.0.0</MicrosoftExtensionsDiagnosticsVersion>
4245
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0</MicrosoftExtensionsHostingAbstractionsVersion>
4346
<MicrosoftExtensionsHostingVersion>8.0.0</MicrosoftExtensionsHostingVersion>
4447
<MicrosoftExtensionsHttpVersion>8.0.0</MicrosoftExtensionsHttpVersion>
45-
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
48+
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.1</MicrosoftExtensionsLoggingAbstractionsVersion>
4649
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0</MicrosoftExtensionsLoggingConfigurationVersion>
4750
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
4851
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
@@ -59,18 +62,18 @@
5962
<SystemSecurityCryptographyPkcsVersion>8.0.0</SystemSecurityCryptographyPkcsVersion>
6063
<SystemSecurityCryptographyXmlVersion>8.0.0</SystemSecurityCryptographyXmlVersion>
6164
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
62-
<SystemTextJsonVersion>8.0.2</SystemTextJsonVersion>
65+
<SystemTextJsonVersion>8.0.3</SystemTextJsonVersion>
6366
<SystemRuntimeCachingVersion>8.0.0</SystemRuntimeCachingVersion>
6467
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
65-
<MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.2</MicrosoftAspNetCoreAppRuntimewinx64Version>
66-
<MicrosoftAspNetCoreMvcTestingVersion>8.0.2</MicrosoftAspNetCoreMvcTestingVersion>
67-
<MicrosoftAspNetCoreTestHostVersion>8.0.2</MicrosoftAspNetCoreTestHostVersion>
68-
<MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.2</MicrosoftExtensionsCachingStackExchangeRedisVersion>
69-
<MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.2</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
70-
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.2</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
71-
<MicrosoftExtensionsFeaturesVersion>8.0.2</MicrosoftExtensionsFeaturesVersion>
72-
<MicrosoftExtensionsHttpPollyVersion>8.0.2</MicrosoftExtensionsHttpPollyVersion>
73-
<MicrosoftExtensionsObjectPoolVersion>8.0.2</MicrosoftExtensionsObjectPoolVersion>
68+
<MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
69+
<MicrosoftAspNetCoreMvcTestingVersion>8.0.3</MicrosoftAspNetCoreMvcTestingVersion>
70+
<MicrosoftAspNetCoreTestHostVersion>8.0.3</MicrosoftAspNetCoreTestHostVersion>
71+
<MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.3</MicrosoftExtensionsCachingStackExchangeRedisVersion>
72+
<MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.3</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
73+
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.3</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
74+
<MicrosoftExtensionsFeaturesVersion>8.0.3</MicrosoftExtensionsFeaturesVersion>
75+
<MicrosoftExtensionsHttpPollyVersion>8.0.3</MicrosoftExtensionsHttpPollyVersion>
76+
<MicrosoftExtensionsObjectPoolVersion>8.0.3</MicrosoftExtensionsObjectPoolVersion>
7477
</PropertyGroup>
7578
<!--
7679

‎eng/pipelines/templates/BuildAndTest.yml

+18
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,24 @@ parameters:
2020
default: 1
2121

2222
steps:
23+
- task: PowerShell@2
24+
displayName: Setup Private Feeds Credentials
25+
condition: eq(variables['Agent.OS'], 'Windows_NT')
26+
inputs:
27+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
28+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
29+
env:
30+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
31+
32+
- task: Bash@3
33+
displayName: Setup Private Feeds Credentials
34+
inputs:
35+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
36+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
37+
condition: ne(variables['Agent.OS'], 'Windows_NT')
38+
env:
39+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
40+
2341
- script: ${{ parameters.buildScript }}
2442
-restore
2543
/bl:${{ parameters.repoLogPath }}/restore.binlog

‎test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Resilience.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ public void AddResilienceHandler_EnsureServicesNotAddedTwice()
9898
// - Configuration of HTTP client options
9999
// - Configuration of resilience pipeline
100100
// - Registration of keyed service for resilience pipeline
101-
builder.Services.Should().HaveCount(count + 3);
101+
// UPDATE NOTE: Starting from .NET 8.0.2, the count of additional services is 2 instead of 3. This is due to the fact that the registration of the resilience
102+
// pipeline is now done in the `AddResilienceHandler` method.
103+
builder.Services.Should().HaveCount(count + 2);
102104
}
103105

104106
[Fact]

0 commit comments

Comments
 (0)