Skip to content

Commit

Permalink
Merged PR 36248: Update platform dependencies to 8.0.1 servicing and …
Browse files Browse the repository at this point in the history
…prepare for 8.1 release

Update platform dependencies to 8.0.1 servicing and prepare for 8.1 release
  • Loading branch information
joperezr committed Jan 8, 2024
1 parent 1e5ad82 commit c63655a
Show file tree
Hide file tree
Showing 7 changed files with 160 additions and 186 deletions.
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
<TestNetCoreTargetFrameworks>$(NetCoreTargetFrameworks)</TestNetCoreTargetFrameworks>
</PropertyGroup>

<!-- Internal branches don't use package source mapping feature due to internal feeds, so disable NU1507 warning saying it should be used. -->
<PropertyGroup>
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>

<PropertyGroup>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<LangVersion>latest</LangVersion>
Expand Down
46 changes: 22 additions & 24 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<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" />
<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" />
<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" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<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" />
<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" />
<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" />
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- Arcade -->
Expand All @@ -16,27 +23,18 @@
<!-- Used for the Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
</packageSources>
<!-- Define mappings by adding package patterns beneath the target source.
https://aka.ms/nuget-package-source-mapping -->
<packageSourceMapping>
<packageSource key="dotnet-public">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet-eng">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet-tools">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet8">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet8-transport">
<package pattern="*" />
</packageSource>
<packageSource key="richnav">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
<disabledPackageSources />
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-8e941eb-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-8e941eb-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-8e941eb" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-bf5e279-1" value="true" />
<add key="darc-int-dotnet-runtime-bf5e279-2" value="true" />
<add key="darc-int-dotnet-runtime-bf5e279" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
</configuration>
50 changes: 0 additions & 50 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,55 +206,6 @@ stages:
warnAsError: 0


# ----------------------------------------------------------------
# This stage performs quality gates enforcements
# ----------------------------------------------------------------
- stage: codecoverage
displayName: CodeCoverage
dependsOn:
- build
condition: and(succeeded('build'), ne(variables['SkipQualityGates'], 'true'))
variables:
- template: /eng/common/templates/variables/pool-providers.yml
jobs:
- template: /eng/common/templates/jobs/jobs.yml
parameters:
enableMicrobuild: true
enableTelemetry: true
runAsPublic: ${{ variables['runAsPublic'] }}
workspace:
clean: all

# ----------------------------------------------------------------
# This stage downloads the code coverage reports from the build jobs,
# merges those and validates the combined test coverage.
# ----------------------------------------------------------------
jobs:
- job: CodeCoverageReport
timeoutInMinutes: 180

pool:
${{ if eq(variables['runAsPublic'], 'true') }}:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals build.ubuntu.2004.amd64.open
# Non-public (i.e., official builds)
${{ else }}:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals build.ubuntu.2004.amd64

preSteps:
- checkout: self
clean: true
persistCredentials: true
fetchDepth: 1

steps:
- script: $(Build.SourcesDirectory)/build.sh --ci --restore
displayName: Init toolset

- template: /eng/pipelines/templates/VerifyCoverageReport.yml


# ----------------------------------------------------------------
# This stage only performs a build treating warnings as errors
# to detect any kind of code style violations
Expand Down Expand Up @@ -313,7 +264,6 @@ stages:
parameters:
validateDependsOn:
- build
- codecoverage
- correctness
publishingInfraVersion: 3
enableSymbolValidation: false
Expand Down
Loading

0 comments on commit c63655a

Please sign in to comment.