Skip to content

Commit 2f2a3fd

Browse files
joperezrjoperezr
committed
Merged PR 50646: Getting ready for the 9.6 Release
Getting ready for th 9.6 release ---- #### AI description (iteration 1) #### PR Classification This PR prepares the repository for the 9.6 release by upgrading dependency versions and refining build pipeline configurations. #### PR Summary The PR updates key dependency versions and adjusts pipeline settings to support a stable 9.6 release build. - `/eng/Version.Details.xml`: Upgraded dependency versions from 9.0.5 to 9.0.6 with corresponding SHA updates. - `/eng/Versions.props`: Updated version properties for major dependencies (and LTS versions bumped to 8.0.17) while enabling package stabilization and setting DotNetFinalVersionKind to release. - `/NuGet.config`: Revised package source definitions and disabled package source mappings for internal feeds. - `/azure-pipelines.yml` & `/eng/pipelines/templates/BuildAndTest.yml`: Removed the CodeCoverage stage and added tasks to set up private feed credentials with integration tests temporarily skipped. - `/Directory.Build.props`: Suppressed the NU1507 warning for internal branch builds. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
1 parent 691f361 commit 2f2a3fd

File tree

6 files changed

+227
-230
lines changed

6 files changed

+227
-230
lines changed

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
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‎

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,31 @@
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-fa4d80b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-3/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-2/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-fa4d80b7-1/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-aspnetcore-379bfc7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-379bfc7b/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-aspnetcore-379bfc7-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-379bfc7b-2/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-aspnetcore-379bfc7-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-379bfc7b-1/nuget/v3/index.json" />
714
<!-- End: Package sources from dotnet-aspnetcore -->
815
<!-- Begin: Package sources from dotnet-efcore -->
16+
<add key="darc-int-dotnet-efcore-f7b16ef" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-f7b16ef0/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-efcore-f7b16ef-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-f7b16ef0-3/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-efcore-f7b16ef-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-f7b16ef0-2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-efcore-f7b16ef-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-f7b16ef0-1/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-efcore-8751e6d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-8751e6d5/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-efcore-8751e6d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-8751e6d5-2/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-efcore-8751e6d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-8751e6d5-1/nuget/v3/index.json" />
923
<!-- End: Package sources from dotnet-efcore -->
1024
<!-- Begin: Package sources from dotnet-runtime -->
25+
<add key="darc-int-dotnet-runtime-77545d6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-runtime-77545d6-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-3/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-runtime-77545d6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-2/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-runtime-77545d6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-1/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-runtime-3875b54" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3875b54e/nuget/v3/index.json" />
30+
<add key="darc-int-dotnet-runtime-3875b54-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3875b54e-2/nuget/v3/index.json" />
31+
<add key="darc-int-dotnet-runtime-3875b54-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3875b54e-1/nuget/v3/index.json" />
1132
<!-- End: Package sources from dotnet-runtime -->
1233
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1334
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
@@ -18,35 +39,34 @@
1839
<!-- Used for the Rich Navigation indexing task -->
1940
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
2041
</packageSources>
21-
<!-- Define mappings by adding package patterns beneath the target source.
22-
https://aka.ms/nuget-package-source-mapping -->
23-
<packageSourceMapping>
24-
<packageSource key="dotnet-public">
25-
<package pattern="*" />
26-
</packageSource>
27-
<packageSource key="dotnet-eng">
28-
<package pattern="*" />
29-
</packageSource>
30-
<packageSource key="dotnet-tools">
31-
<package pattern="*" />
32-
</packageSource>
33-
<packageSource key="dotnet9">
34-
<package pattern="*" />
35-
</packageSource>
36-
<packageSource key="dotnet9-transport">
37-
<package pattern="*" />
38-
</packageSource>
39-
<packageSource key="richnav">
40-
<package pattern="*" />
41-
</packageSource>
42-
</packageSourceMapping>
4342
<disabledPackageSources>
4443
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4544
<!-- Begin: Package sources from dotnet-aspnetcore -->
45+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-1" value="true" />
46+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-2" value="true" />
47+
<add key="darc-int-dotnet-aspnetcore-fa4d80b-3" value="true" />
48+
<add key="darc-int-dotnet-aspnetcore-fa4d80b" value="true" />
49+
<add key="darc-int-dotnet-aspnetcore-379bfc7-1" value="true" />
50+
<add key="darc-int-dotnet-aspnetcore-379bfc7-2" value="true" />
51+
<add key="darc-int-dotnet-aspnetcore-379bfc7" value="true" />
4652
<!-- Begin: Package sources from dotnet-efcore -->
53+
<add key="darc-int-dotnet-efcore-f7b16ef-1" value="true" />
54+
<add key="darc-int-dotnet-efcore-f7b16ef-2" value="true" />
55+
<add key="darc-int-dotnet-efcore-f7b16ef-3" value="true" />
56+
<add key="darc-int-dotnet-efcore-f7b16ef" value="true" />
57+
<add key="darc-int-dotnet-efcore-8751e6d-1" value="true" />
58+
<add key="darc-int-dotnet-efcore-8751e6d-2" value="true" />
59+
<add key="darc-int-dotnet-efcore-8751e6d" value="true" />
4760
<!-- End: Package sources from dotnet-efcore -->
4861
<!-- End: Package sources from dotnet-aspnetcore -->
4962
<!-- Begin: Package sources from dotnet-runtime -->
63+
<add key="darc-int-dotnet-runtime-77545d6-1" value="true" />
64+
<add key="darc-int-dotnet-runtime-77545d6-2" value="true" />
65+
<add key="darc-int-dotnet-runtime-77545d6-3" value="true" />
66+
<add key="darc-int-dotnet-runtime-77545d6" value="true" />
67+
<add key="darc-int-dotnet-runtime-3875b54-1" value="true" />
68+
<add key="darc-int-dotnet-runtime-3875b54-2" value="true" />
69+
<add key="darc-int-dotnet-runtime-3875b54" value="true" />
5070
<!-- End: Package sources from dotnet-runtime -->
5171
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5272
</disabledPackageSources>

‎azure-pipelines.yml‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -239,51 +239,6 @@ extends:
239239
isWindows: false
240240
warnAsError: 0
241241

242-
# ----------------------------------------------------------------
243-
# This stage performs quality gates enforcements
244-
# ----------------------------------------------------------------
245-
- stage: codecoverage
246-
displayName: CodeCoverage
247-
dependsOn:
248-
- build
249-
condition: and(succeeded('build'), ne(variables['SkipQualityGates'], 'true'))
250-
variables:
251-
- template: /eng/common/templates-official/variables/pool-providers.yml@self
252-
jobs:
253-
- template: /eng/common/templates-official/jobs/jobs.yml@self
254-
parameters:
255-
enableMicrobuild: true
256-
enableTelemetry: true
257-
runAsPublic: ${{ variables['runAsPublic'] }}
258-
workspace:
259-
clean: all
260-
261-
# ----------------------------------------------------------------
262-
# This stage downloads the code coverage reports from the build jobs,
263-
# merges those and validates the combined test coverage.
264-
# ----------------------------------------------------------------
265-
jobs:
266-
- job: CodeCoverageReport
267-
timeoutInMinutes: 180
268-
269-
pool:
270-
name: NetCore1ESPool-Internal
271-
image: 1es-mariner-2
272-
os: linux
273-
274-
preSteps:
275-
- checkout: self
276-
clean: true
277-
persistCredentials: true
278-
fetchDepth: 1
279-
280-
steps:
281-
- script: $(Build.SourcesDirectory)/build.sh --ci --restore
282-
displayName: Init toolset
283-
284-
- template: /eng/pipelines/templates/VerifyCoverageReport.yml
285-
286-
287242
# ----------------------------------------------------------------
288243
# This stage only performs a build treating warnings as errors
289244
# to detect any kind of code style violations
@@ -339,7 +294,6 @@ extends:
339294
parameters:
340295
validateDependsOn:
341296
- build
342-
- codecoverage
343297
- correctness
344298
publishingInfraVersion: 3
345299
enableSymbolValidation: false

0 commit comments

Comments
 (0)