Skip to content

Commit 64bff1a

Browse files
authored
[release/8.0-staging] Update APICompat baseline version to 8.0.0 (#94716)
1 parent e585246 commit 64bff1a

File tree

9 files changed

+21
-2713
lines changed

9 files changed

+21
-2713
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114
<NetFrameworkCurrent Condition="'$(DotNetBuildFromSource)' == 'true'" />
115115

116116
<!-- Important: Set this to the GA version (or a close approximation) during servicing and adjust the TFM property below. -->
117-
<ApiCompatNetCoreAppBaselineVersion>7.0.0</ApiCompatNetCoreAppBaselineVersion>
118-
<ApiCompatNetCoreAppBaselineTFM>net7.0</ApiCompatNetCoreAppBaselineTFM>
117+
<ApiCompatNetCoreAppBaselineVersion>8.0.0</ApiCompatNetCoreAppBaselineVersion>
118+
<ApiCompatNetCoreAppBaselineTFM>net8.0</ApiCompatNetCoreAppBaselineTFM>
119119

120120
<TargetFrameworkForNETFrameworkTasks>$(NetFrameworkToolCurrent)</TargetFrameworkForNETFrameworkTasks>
121121
<!-- Don't build for NETFramework during source-build. -->

eng/Version.Details.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,13 @@
383383
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
384384
<Sha>b4d9a1334d5189172977ba8fddd00bda70161e4a</Sha>
385385
</Dependency>
386-
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="8.0.100-rtm.23520.8">
386+
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="8.0.100">
387387
<Uri>https://github.com/dotnet/sdk</Uri>
388-
<Sha>7e33fd449381b337c290a801057fdcd68c4b7220</Sha>
388+
<Sha>e9d13cbe7e8c1d52ce276a8655f52a87e1017c46</Sha>
389+
</Dependency>
390+
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="8.0.100-rtm.23551.6">
391+
<Uri>https://github.com/dotnet/sdk</Uri>
392+
<Sha>e9d13cbe7e8c1d52ce276a8655f52a87e1017c46</Sha>
389393
<SourceBuild RepoName="sdk" ManagedOnly="true" />
390394
</Dependency>
391395
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23521.3">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<PropertyGroup>
8686
<StaticCsVersion>0.2.0</StaticCsVersion>
8787
<!-- SDK dependencies -->
88-
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-rtm.23520.8</MicrosoftDotNetApiCompatTaskVersion>
88+
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
9090
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23516.4</MicrosoftDotNetBuildTasksFeedVersion>
9191
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23516.4</MicrosoftDotNetCodeAnalysisVersion>
@@ -127,7 +127,7 @@
127127
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
128128
<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
129129
<SystemDataSqlClientVersion>4.8.5</SystemDataSqlClientVersion>
130-
<SystemDrawingCommonVersion>7.0.0</SystemDrawingCommonVersion>
130+
<SystemDrawingCommonVersion>8.0.0</SystemDrawingCommonVersion>
131131
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
132132
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
133133
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>

eng/packaging.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
'$(SuppressFinalPackageVersion)' == 'true' or
1212
'$(DotNetBuildFromSource)' == 'true'">true</DisablePackageBaselineValidation>
1313
<PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">$(ApiCompatNetCoreAppBaselineVersion)</PackageValidationBaselineVersion>
14+
1415
<BeforePack>$(BeforePack);IncludeAnalyzersInPackage;AddNETStandardCompatErrorFileForPackaging</BeforePack>
1516
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificFilesToPackage;IncludeProjectReferencesWithPackAttributeInPackage</TargetsForTfmSpecificContentInPackage>
1617
<!-- Don't include target platform specific dependencies, since we use the target platform to represent RIDs instead -->
@@ -37,6 +38,13 @@
3738
<BuildProjectReferences Condition="'$(NoBuild)' == 'true'">false</BuildProjectReferences>
3839
</PropertyGroup>
3940

41+
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
42+
<!-- In servicing, the live package is compared against the GA version in strict mode. -->
43+
<EnableStrictModeForBaselineValidation>true</EnableStrictModeForBaselineValidation>
44+
<!-- In servicing, disable the APICompat rule that validates that the assembly versions must match. -->
45+
<NoWarn>$(NoWarn);CP0003</NoWarn>
46+
</PropertyGroup>
47+
4048
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing' and
4149
'$(PackageUseIncrementalServicingVersion)' == 'true'">
4250
<!-- If no servicing version is set we need to default to 0 in order for dependency versions to

src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/libraries/Microsoft.NET.WebAssembly.Threading/src/CompatibilitySuppressions.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/libraries/Microsoft.NET.WebAssembly.Threading/src/Microsoft.NET.WebAssembly.Threading.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<NoWarn>$(NoWarn);NU5128;NU5131;PKV004</NoWarn>
1313
<!-- Place assemblies in the nuget ref folder -->
1414
<BuildOutputTargetFolder>ref</BuildOutputTargetFolder>
15+
<DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
1516
</PropertyGroup>
1617

1718
<ItemGroup>

src/libraries/apicompat/ApiCompat.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<!-- Restore and reference assemblies not built in runtime anymore, required for resolving type forward on both comparison sides. -->
4646
<ApiCompatTypeForwardDestinationPackage Include="System.Data.SqlClient" PackageVersion="$(SystemDataSqlClientVersion)" TargetFramework="netcoreapp2.1" />
47-
<ApiCompatTypeForwardDestinationPackage Include="System.Drawing.Common" PackageVersion="$(SystemDrawingCommonVersion)" TargetFramework="net7.0" />
47+
<ApiCompatTypeForwardDestinationPackage Include="System.Drawing.Common" PackageVersion="$(SystemDrawingCommonVersion)" TargetFramework="net8.0" />
4848

4949
<!-- Restore and reference assemblies required for resolving type forwards on the baseline (left) side. -->
5050
<ApiCompatLeftTypeForwardDestinationPackage Include="@(ApiCompatTypeForwardDestinationPackage)" />

0 commit comments

Comments
 (0)