Skip to content

Commit 2d7ad3a

Browse files
committed
Merged PR 43287: Getting ready for 8.10 release
Getting ready for 8.10 release ---- #### AI description (iteration 1) #### PR Classification Release preparation #### PR Summary This pull request updates dependencies and configurations in preparation for the 8.10 release. - `/eng/Version.Details.xml`: Updated various dependencies to newer versions. - `/eng/Versions.props`: Synchronized dependency versions with the latest updates. - `/azure-pipelines.yml`: Removed the `codecoverage` stage. - `/eng/pipelines/templates/BuildAndTest.yml`: Added steps to set up private feed credentials for both Windows and non-Windows agents.
1 parent 18002be commit 2d7ad3a

6 files changed

+118
-144
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

+20-26
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,18 @@
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-954f61d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd-8/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-aspnetcore-c2a4429-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-9/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-aspnetcore-c2a4429-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-6/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-aspnetcore-c2a4429-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-5/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-aspnetcore-c2a4429-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-4/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-aspnetcore-c2a4429-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-3/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-aspnetcore-c2a4429-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-10/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c2a44298-1/nuget/v3/index.json" />
916
<!-- End: Package sources from dotnet-aspnetcore -->
1017
<!-- Begin: Package sources from dotnet-runtime -->
18+
<add key="darc-int-dotnet-runtime-81cabf2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-81cabf28-3/nuget/v3/index.json" />
1119
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
1220
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
1321
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
@@ -24,40 +32,26 @@
2432
<!-- Used for the Rich Navigation indexing task -->
2533
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
2634
</packageSources>
27-
<!-- Define mappings by adding package patterns beneath the target source.
28-
https://aka.ms/nuget-package-source-mapping -->
29-
<packageSourceMapping>
30-
<packageSource key="dotnet-public">
31-
<package pattern="*" />
32-
</packageSource>
33-
<packageSource key="dotnet-eng">
34-
<package pattern="*" />
35-
</packageSource>
36-
<packageSource key="dotnet-tools">
37-
<package pattern="*" />
38-
</packageSource>
39-
<packageSource key="dotnet8">
40-
<package pattern="*" />
41-
</packageSource>
42-
<packageSource key="dotnet8-transport">
43-
<package pattern="*" />
44-
</packageSource>
45-
<packageSource key="richnav">
46-
<package pattern="*" />
47-
</packageSource>
48-
</packageSourceMapping>
4935
<disabledPackageSources>
5036
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
5137
<!-- Begin: Package sources from dotnet-aspnetcore -->
52-
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
53-
<add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
38+
<add key="darc-int-dotnet-aspnetcore-c2a4429-1" value="true" />
39+
<add key="darc-int-dotnet-aspnetcore-c2a4429-10" value="true" />
40+
<add key="darc-int-dotnet-aspnetcore-c2a4429-2" value="true" />
41+
<add key="darc-int-dotnet-aspnetcore-c2a4429-3" value="true" />
42+
<add key="darc-int-dotnet-aspnetcore-c2a4429-4" value="true" />
43+
<add key="darc-int-dotnet-aspnetcore-c2a4429-5" value="true" />
44+
<add key="darc-int-dotnet-aspnetcore-c2a4429-6" value="true" />
45+
<add key="darc-int-dotnet-aspnetcore-c2a4429-9" value="true" />
46+
<add key="darc-int-dotnet-aspnetcore-c2a4429" value="true" />
5447
<!-- End: Package sources from dotnet-aspnetcore -->
5548
<!-- Begin: Package sources from dotnet-runtime -->
5649
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
5750
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
5851
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
5952
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
6053
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
54+
<add key="darc-int-dotnet-runtime-81cabf2-3" value="true" />
6155
<!-- End: Package sources from dotnet-runtime -->
6256
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6357
</disabledPackageSources>

azure-pipelines.yml

+1-47
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ extends:
141141
parameters:
142142
enableMicrobuild: true
143143
enableTelemetry: true
144-
enableSourceIndex: true
144+
enableSourceIndex: false
145145
runAsPublic: ${{ variables['runAsPublic'] }}
146146
# Publish build logs
147147
enablePublishBuildArtifacts: true
@@ -218,51 +218,6 @@ extends:
218218
isWindows: false
219219
warnAsError: 0
220220

221-
# ----------------------------------------------------------------
222-
# This stage performs quality gates enforcements
223-
# ----------------------------------------------------------------
224-
- stage: codecoverage
225-
displayName: CodeCoverage
226-
dependsOn:
227-
- build
228-
condition: and(succeeded('build'), ne(variables['SkipQualityGates'], 'true'))
229-
variables:
230-
- template: /eng/common/templates-official/variables/pool-providers.yml@self
231-
jobs:
232-
- template: /eng/common/templates-official/jobs/jobs.yml@self
233-
parameters:
234-
enableMicrobuild: true
235-
enableTelemetry: true
236-
runAsPublic: ${{ variables['runAsPublic'] }}
237-
workspace:
238-
clean: all
239-
240-
# ----------------------------------------------------------------
241-
# This stage downloads the code coverage reports from the build jobs,
242-
# merges those and validates the combined test coverage.
243-
# ----------------------------------------------------------------
244-
jobs:
245-
- job: CodeCoverageReport
246-
timeoutInMinutes: 180
247-
248-
pool:
249-
name: NetCore1ESPool-Internal
250-
image: 1es-mariner-2
251-
os: linux
252-
253-
preSteps:
254-
- checkout: self
255-
clean: true
256-
persistCredentials: true
257-
fetchDepth: 1
258-
259-
steps:
260-
- script: $(Build.SourcesDirectory)/build.sh --ci --restore
261-
displayName: Init toolset
262-
263-
- template: /eng/pipelines/templates/VerifyCoverageReport.yml
264-
265-
266221
# ----------------------------------------------------------------
267222
# This stage only performs a build treating warnings as errors
268223
# to detect any kind of code style violations
@@ -318,7 +273,6 @@ extends:
318273
parameters:
319274
validateDependsOn:
320275
- build
321-
- codecoverage
322276
- correctness
323277
publishingInfraVersion: 3
324278
enableSymbolValidation: false

0 commit comments

Comments
 (0)