Skip to content

Commit 8757c10

Browse files
joperezrjoperezr
committed
Merged PR 38774: Preparing for 8.4 release
Preparing for 8.4 release
1 parent 7271d19 commit 8757c10

File tree

6 files changed

+70
-99
lines changed

6 files changed

+70
-99
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-8486d31" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8486d31e/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-aspnetcore-8486d31-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8486d31e-2/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-aspnetcore-8486d31-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8486d31e-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-2d7eea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2d7eea25/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-runtime-2d7eea2-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2d7eea25-2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-runtime-2d7eea2-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2d7eea25-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-8486d31-1" value="true" />
30+
<add key="darc-int-dotnet-aspnetcore-8486d31-2" value="true" />
31+
<add key="darc-int-dotnet-aspnetcore-8486d31" value="true" />
4532
<!-- End: Package sources from dotnet-aspnetcore -->
4633
<!-- Begin: Package sources from dotnet-runtime -->
34+
<add key="darc-int-dotnet-runtime-2d7eea2-1" value="true" />
35+
<add key="darc-int-dotnet-runtime-2d7eea2-2" value="true" />
36+
<add key="darc-int-dotnet-runtime-2d7eea2" 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

-45
Original file line numberDiff line numberDiff line change
@@ -213,50 +213,6 @@ extends:
213213
isWindows: false
214214
warnAsError: 0
215215

216-
# ----------------------------------------------------------------
217-
# This stage performs quality gates enforcements
218-
# ----------------------------------------------------------------
219-
- stage: codecoverage
220-
displayName: CodeCoverage
221-
dependsOn:
222-
- build
223-
condition: and(succeeded('build'), ne(variables['SkipQualityGates'], 'true'))
224-
variables:
225-
- template: /eng/common/templates-official/variables/pool-providers.yml@self
226-
jobs:
227-
- template: /eng/common/templates-official/jobs/jobs.yml@self
228-
parameters:
229-
enableMicrobuild: true
230-
enableTelemetry: true
231-
runAsPublic: ${{ variables['runAsPublic'] }}
232-
workspace:
233-
clean: all
234-
235-
# ----------------------------------------------------------------
236-
# This stage downloads the code coverage reports from the build jobs,
237-
# merges those and validates the combined test coverage.
238-
# ----------------------------------------------------------------
239-
jobs:
240-
- job: CodeCoverageReport
241-
timeoutInMinutes: 180
242-
243-
pool:
244-
name: NetCore1ESPool-Internal
245-
image: 1es-mariner-2-pt
246-
os: linux
247-
248-
preSteps:
249-
- checkout: self
250-
clean: true
251-
persistCredentials: true
252-
fetchDepth: 1
253-
254-
steps:
255-
- script: $(Build.SourcesDirectory)/build.sh --ci --restore
256-
displayName: Init toolset
257-
258-
- template: /eng/pipelines/templates/VerifyCoverageReport.yml
259-
260216

261217
# ----------------------------------------------------------------
262218
# This stage only performs a build treating warnings as errors
@@ -313,7 +269,6 @@ extends:
313269
parameters:
314270
validateDependsOn:
315271
- build
316-
- codecoverage
317272
- correctness
318273
publishingInfraVersion: 3
319274
enableSymbolValidation: false

‎eng/Version.Details.xml

+20-20
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
9797
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
9898
</Dependency>
99-
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
99+
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
100100
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
101-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
101+
<Sha>2d7eea252964e69be94cb9c847b371b23e4dd470</Sha>
102102
</Dependency>
103103
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
104104
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -132,41 +132,41 @@
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.3">
135+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.4">
136136
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
137-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
137+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
138138
</Dependency>
139-
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3">
139+
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4">
140140
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
141-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
141+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
142142
</Dependency>
143-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.3">
143+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.4">
144144
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
145-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
145+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
146146
</Dependency>
147-
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.3">
147+
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.4">
148148
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
149-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
149+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
150150
</Dependency>
151-
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.3">
151+
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.4">
152152
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
153-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
153+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
154154
</Dependency>
155-
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3">
155+
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.4">
156156
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
157-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
157+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.Extensions.Features" Version="8.0.3">
159+
<Dependency Name="Microsoft.Extensions.Features" Version="8.0.4">
160160
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
161-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
161+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.3">
163+
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.4">
164164
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
165-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
165+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.3">
167+
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.4">
168168
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
169-
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
169+
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
170170
</Dependency>
171171
</ProductDependencies>
172172
<ToolsetDependencies>

‎eng/Versions.props

+15-12
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
<MajorVersion>8</MajorVersion>
44
<MinorVersion>4</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>
@@ -52,7 +55,7 @@
5255
<MicrosoftExtensionsPrimitivesVersion>8.0.0</MicrosoftExtensionsPrimitivesVersion>
5356
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
5457
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
55-
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0</SystemDiagnosticsDiagnosticSourceVersion>
58+
<SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
5659
<SystemDiagnosticsPerformanceCounterVersion>8.0.0</SystemDiagnosticsPerformanceCounterVersion>
5760
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
5861
<SystemNetHttpJsonVersion>8.0.0</SystemNetHttpJsonVersion>
@@ -62,15 +65,15 @@
6265
<SystemTextJsonVersion>8.0.3</SystemTextJsonVersion>
6366
<SystemRuntimeCachingVersion>8.0.0</SystemRuntimeCachingVersion>
6467
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
65-
<MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
66-
<MicrosoftAspNetCoreMvcTestingVersion>8.0.3</MicrosoftAspNetCoreMvcTestingVersion>
67-
<MicrosoftAspNetCoreTestHostVersion>8.0.3</MicrosoftAspNetCoreTestHostVersion>
68-
<MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.3</MicrosoftExtensionsCachingStackExchangeRedisVersion>
69-
<MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.3</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
70-
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.3</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
71-
<MicrosoftExtensionsFeaturesVersion>8.0.3</MicrosoftExtensionsFeaturesVersion>
72-
<MicrosoftExtensionsHttpPollyVersion>8.0.3</MicrosoftExtensionsHttpPollyVersion>
73-
<MicrosoftExtensionsObjectPoolVersion>8.0.3</MicrosoftExtensionsObjectPoolVersion>
68+
<MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.4</MicrosoftAspNetCoreAppRuntimewinx64Version>
69+
<MicrosoftAspNetCoreMvcTestingVersion>8.0.4</MicrosoftAspNetCoreMvcTestingVersion>
70+
<MicrosoftAspNetCoreTestHostVersion>8.0.4</MicrosoftAspNetCoreTestHostVersion>
71+
<MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.4</MicrosoftExtensionsCachingStackExchangeRedisVersion>
72+
<MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.4</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
73+
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.4</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
74+
<MicrosoftExtensionsFeaturesVersion>8.0.4</MicrosoftExtensionsFeaturesVersion>
75+
<MicrosoftExtensionsHttpPollyVersion>8.0.4</MicrosoftExtensionsHttpPollyVersion>
76+
<MicrosoftExtensionsObjectPoolVersion>8.0.4</MicrosoftExtensionsObjectPoolVersion>
7477
</PropertyGroup>
7578
<!--
7679

‎eng/pipelines/templates/BuildAndTest.yml

+18
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,24 @@ parameters:
2323
default: false
2424

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

0 commit comments

Comments
 (0)