Skip to content

Commit c63655a

Browse files
joperezrjoperezr
committed
Merged PR 36248: Update platform dependencies to 8.0.1 servicing and prepare for 8.1 release
Update platform dependencies to 8.0.1 servicing and prepare for 8.1 release
1 parent 1e5ad82 commit c63655a

File tree

7 files changed

+160
-186
lines changed

7 files changed

+160
-186
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

+22-24
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-aspnetcore -->
7+
<add key="darc-int-dotnet-aspnetcore-8e941eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8e941eb4/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-aspnetcore-8e941eb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8e941eb4-2/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-aspnetcore-8e941eb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-8e941eb4-1/nuget/v3/index.json" />
10+
<!-- End: Package sources from dotnet-aspnetcore -->
611
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-pub-dotnet-runtime-488a8a3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-488a8a35/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-bf5e279" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-runtime-bf5e279-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-2/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-runtime-bf5e279-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-1/nuget/v3/index.json" />
815
<!-- End: Package sources from dotnet-runtime -->
916
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1017
<!-- Arcade -->
@@ -16,27 +23,18 @@
1623
<!-- Used for the Rich Navigation indexing task -->
1724
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
1825
</packageSources>
19-
<!-- Define mappings by adding package patterns beneath the target source.
20-
https://aka.ms/nuget-package-source-mapping -->
21-
<packageSourceMapping>
22-
<packageSource key="dotnet-public">
23-
<package pattern="*" />
24-
</packageSource>
25-
<packageSource key="dotnet-eng">
26-
<package pattern="*" />
27-
</packageSource>
28-
<packageSource key="dotnet-tools">
29-
<package pattern="*" />
30-
</packageSource>
31-
<packageSource key="dotnet8">
32-
<package pattern="*" />
33-
</packageSource>
34-
<packageSource key="dotnet8-transport">
35-
<package pattern="*" />
36-
</packageSource>
37-
<packageSource key="richnav">
38-
<package pattern="*" />
39-
</packageSource>
40-
</packageSourceMapping>
41-
<disabledPackageSources />
26+
<disabledPackageSources>
27+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
28+
<!-- Begin: Package sources from dotnet-aspnetcore -->
29+
<add key="darc-int-dotnet-aspnetcore-8e941eb-1" value="true" />
30+
<add key="darc-int-dotnet-aspnetcore-8e941eb-2" value="true" />
31+
<add key="darc-int-dotnet-aspnetcore-8e941eb" value="true" />
32+
<!-- End: Package sources from dotnet-aspnetcore -->
33+
<!-- Begin: Package sources from dotnet-runtime -->
34+
<add key="darc-int-dotnet-runtime-bf5e279-1" value="true" />
35+
<add key="darc-int-dotnet-runtime-bf5e279-2" value="true" />
36+
<add key="darc-int-dotnet-runtime-bf5e279" value="true" />
37+
<!-- End: Package sources from dotnet-runtime -->
38+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
39+
</disabledPackageSources>
4240
</configuration>

‎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

0 commit comments

Comments
 (0)