Skip to content

Commit c9f3f0d

Browse files
rainersigwaldrainersigwald
authored
Update to RC1 (#9249)
* Update to RC1 * Copy RID graph to bootstrap This enables UseRidGraph=true builds, like many of our projects.
1 parent 914c3e8 commit c9f3f0d

10 files changed

+16
-70
lines changed

‎eng/BootStrapMSBuild.targets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,9 @@
229229
<Copy SourceFiles="@(NuGetSdkResolverManifest)"
230230
DestinationFolder="$(BootstrapDestination)SdkResolvers\Microsoft.Build.NuGetSdkResolver" />
231231

232+
<Copy SourceFiles="$(RuntimeIdentifierGraphPath)"
233+
DestinationFolder="$(BootstrapDestination)" />
234+
232235
<Copy SourceFiles="@(InstalledSdks)"
233236
DestinationFiles="@(InstalledSdks -> '$(BootstrapDestination)Sdks\%(RecursiveDir)%(Filename)%(Extension)')" />
234237

‎global.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"sdk": {
3-
"allowPrerelease": true
2+
"sdk": {
3+
"allowPrerelease": true
4+
},
5+
"tools": {
6+
"dotnet": "8.0.100-rc.1.23463.5",
7+
"vs": {
8+
"version": "17.7.0"
49
},
5-
"tools": {
6-
"dotnet": "8.0.100-preview.7.23376.3",
7-
"vs": {
8-
"version": "17.6.0"
9-
},
10-
"xcopy-msbuild": "17.6.0-2"
11-
},
12-
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2"
14-
}
15-
}
10+
"xcopy-msbuild": "17.7.2"
11+
},
12+
"msbuild-sdks": {
13+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23425.2"
14+
}
15+
}

‎src/Build/CompatibilitySuppressions.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
33
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4-
<!-- For updating target framework from net 7.0 to net 8.0 in MSBuild 17.8 suppress baseline package validation error PKV006 on net 7.0 -->
5-
<Suppression>
6-
<DiagnosticId>PKV006</DiagnosticId>
7-
<Target>net7.0</Target>
8-
</Suppression>
94
</Suppressions>

‎src/Build/Microsoft.Build.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
<NoWarn>$(NoWarn);NU5104</NoWarn>
2727
</PropertyGroup>
2828

29-
<PropertyGroup>
30-
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
31-
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
32-
</PropertyGroup>
33-
3429
<ItemGroup>
3530
<ProjectReference Include="..\Framework\Microsoft.Build.Framework.csproj" />
3631
<ProjectReference Include="..\StringTools\StringTools.csproj" />

‎src/Framework/CompatibilitySuppressions.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,4 @@
5454
<DiagnosticId>PKV004</DiagnosticId>
5555
<Target>Xamarin.XboxOne,Version=v0.0</Target>
5656
</Suppression>
57-
<!-- For updating target framework from net 7.0 to net 8.0 in MSBuild 17.8 suppress baseline package validation error PKV006 on net 7.0 -->
58-
<Suppression>
59-
<DiagnosticId>PKV006</DiagnosticId>
60-
<Target>net7.0</Target>
61-
</Suppression>
6257
</Suppressions>

‎src/Framework/Microsoft.Build.Framework.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
<PackageReference Include="Microsoft.Win32.Registry" />
2828
</ItemGroup>
2929

30-
<PropertyGroup>
31-
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
32-
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
33-
</PropertyGroup>
34-
3530
<ItemGroup>
3631
<Compile Include="..\Shared\Constants.cs">
3732
<Link>Shared\Constants.cs</Link>

‎src/Tasks/CompatibilitySuppressions.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@
1212
<Right>ref/net472/Microsoft.Build.Tasks.Core.dll</Right>
1313
</Suppression>
1414

15-
<!-- We don't have the net7 reference assemblies handy to pass in to compare against the net8 ones -->
16-
<Suppression>
17-
<DiagnosticId>CP1002</DiagnosticId>
18-
<Target>System.Security.Cryptography, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Target>
19-
<Left>ref/net7.0/Microsoft.Build.Tasks.Core.dll</Left>
20-
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
21-
<IsBaselineSuppression>true</IsBaselineSuppression>
22-
</Suppression>
23-
2415
<!-- PKV004 for netstandard2.0-supporting TFs that we do not have runtime assemblies for.
2516
This is intentional, because you can only use MSBuild in the context of a .NET SDK
2617
(on net7.0, as of MSBuild 17.4) or in the context of Visual Studio (net472), but we
@@ -74,9 +65,4 @@
7465
<DiagnosticId>PKV004</DiagnosticId>
7566
<Target>Xamarin.XboxOne,Version=v0.0</Target>
7667
</Suppression>
77-
<!-- For updating target framework from net 7.0 to net 8.0 in MSBuild 17.8 suppress baseline package validation error PKV006 on net 7.0 -->
78-
<Suppression>
79-
<DiagnosticId>PKV006</DiagnosticId>
80-
<Target>net7.0</Target>
81-
</Suppression>
8268
</Suppressions>

‎src/Tasks/Microsoft.Build.Tasks.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
<EnablePackageValidation>true</EnablePackageValidation>
2020
</PropertyGroup>
2121

22-
<PropertyGroup>
23-
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
24-
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
25-
</PropertyGroup>
26-
2722
<ItemGroup>
2823
<EmbeddedResource Include="system.design\system.design.txt">
2924
<Type>Resx</Type>

‎src/Utilities/CompatibilitySuppressions.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
33
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4-
<!-- We don't have the net7 reference assemblies handy to pass in to compare against the net8 ones -->
5-
<Suppression>
6-
<DiagnosticId>CP1002</DiagnosticId>
7-
<Target>System.Runtime, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Target>
8-
<Left>ref/net7.0/Microsoft.Build.Utilities.Core.dll</Left>
9-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
10-
<IsBaselineSuppression>true</IsBaselineSuppression>
11-
</Suppression>
124
<!-- PKV004 for netstandard2.0-supporting TFs that we do not have runtime assemblies for.
135
This is intentional, because you can only use MSBuild in the context of a .NET SDK
146
(on net7.0, as of MSBuild 17.4) or in the context of Visual Studio (net472), but we
@@ -62,9 +54,4 @@
6254
<DiagnosticId>PKV004</DiagnosticId>
6355
<Target>Xamarin.XboxOne,Version=v0.0</Target>
6456
</Suppression>
65-
<!-- For updating target framework from net 7.0 to net 8.0 in MSBuild 17.8 suppress baseline package validation error PKV006 on net 7.0 -->
66-
<Suppression>
67-
<DiagnosticId>PKV006</DiagnosticId>
68-
<Target>net7.0</Target>
69-
</Suppression>
7057
</Suppressions>

‎src/Utilities/Microsoft.Build.Utilities.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
<EnablePackageValidation>true</EnablePackageValidation>
1919
</PropertyGroup>
2020

21-
<PropertyGroup>
22-
<ApiCompatPreserveUnnecessarySuppressions>true</ApiCompatPreserveUnnecessarySuppressions>
23-
<ApiCompatPermitUnnecessarySuppressions>true</ApiCompatPermitUnnecessarySuppressions>
24-
</PropertyGroup>
25-
2621
<ItemGroup>
2722
<ProjectReference Include="..\Framework\Microsoft.Build.Framework.csproj" />
2823
<ProjectReference Include="..\StringTools\StringTools.csproj" />

0 commit comments

Comments
 (0)