Skip to content

Commit 76aced2

Browse files
AR-MayAR-May
authored
Branding for 18.1 (#12586)
1 parent f87a18c commit 76aced2

File tree

5 files changed

+3
-255
lines changed

5 files changed

+3
-255
lines changed

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Project>
44
<Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
55
<PropertyGroup>
6-
<VersionPrefix>18.0.0</VersionPrefix>
7-
<PackageValidationBaselineVersion>17.14.8</PackageValidationBaselineVersion>
6+
<VersionPrefix>18.1.0</VersionPrefix>
7+
<PackageValidationBaselineVersion>18.0.0-preview-25480-115</PackageValidationBaselineVersion>
88
<AssemblyVersion>15.1.0.0</AssemblyVersion>
99
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1010

‎src/Build/CompatibilitySuppressions.xml‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
3-
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4-
<!--
5-
Since we are dropping the .net 9 and retarrgetting to .net 10, we need to suppress the following errors.
6-
The comparison ref/net.9 with ref/netstandard2.0 is not valid anymore.
7-
-->
8-
<Suppression>
9-
<DiagnosticId>CP0001</DiagnosticId>
10-
<Target>T:Microsoft.Build.Experimental.ProjectCache.ProjectCacheDescriptor</Target>
11-
<Left>lib/net472/Microsoft.Build.dll</Left>
12-
<Right>lib/net472/Microsoft.Build.dll</Right>
13-
<IsBaselineSuppression>true</IsBaselineSuppression>
14-
</Suppression>
15-
<Suppression>
16-
<DiagnosticId>CP0001</DiagnosticId>
17-
<Target>T:Microsoft.Build.Experimental.ProjectCache.ProjectCacheDescriptor</Target>
18-
<Left>ref/net472/Microsoft.Build.dll</Left>
19-
<Right>ref/net472/Microsoft.Build.dll</Right>
20-
<IsBaselineSuppression>true</IsBaselineSuppression>
21-
</Suppression>
22-
<Suppression>
23-
<DiagnosticId>CP0002</DiagnosticId>
24-
<Target>M:Microsoft.Build.Execution.BuildParameters.get_ProjectCacheDescriptor</Target>
25-
<Left>lib/net472/Microsoft.Build.dll</Left>
26-
<Right>lib/net472/Microsoft.Build.dll</Right>
27-
<IsBaselineSuppression>true</IsBaselineSuppression>
28-
</Suppression>
29-
<Suppression>
30-
<DiagnosticId>CP0002</DiagnosticId>
31-
<Target>M:Microsoft.Build.Execution.BuildParameters.get_ProjectCacheDescriptor</Target>
32-
<Left>ref/net472/Microsoft.Build.dll</Left>
33-
<Right>ref/net472/Microsoft.Build.dll</Right>
34-
<IsBaselineSuppression>true</IsBaselineSuppression>
35-
</Suppression>
36-
<Suppression>
37-
<DiagnosticId>PKV006</DiagnosticId>
38-
<Target>net9.0</Target>
39-
</Suppression>
40-
</Suppressions>
3+
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" />

‎src/Framework/CompatibilitySuppressions.xml‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- https://learn.microsoft.com/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-
<!--
5-
Since we are dropping the .net 9 and retarrgetting to .net 10, we need to suppress the following errors.
6-
The comparison ref/net.9 with ref/netstandard2.0 is not valid anymore.
7-
-->
8-
<Suppression>
9-
<DiagnosticId>CP0008</DiagnosticId>
10-
<Target>T:Microsoft.Build.Execution.BuildRequestDataFlags</Target>
11-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
12-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
13-
<IsBaselineSuppression>true</IsBaselineSuppression>
14-
</Suppression>
15-
<Suppression>
16-
<DiagnosticId>CP0008</DiagnosticId>
17-
<Target>T:Microsoft.Build.Framework.AssemblyLoadingContext</Target>
18-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
19-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
20-
<IsBaselineSuppression>true</IsBaselineSuppression>
21-
</Suppression>
22-
<Suppression>
23-
<DiagnosticId>CP0008</DiagnosticId>
24-
<Target>T:Microsoft.Build.Framework.FeatureStatus</Target>
25-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
26-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
27-
<IsBaselineSuppression>true</IsBaselineSuppression>
28-
</Suppression>
29-
<Suppression>
30-
<DiagnosticId>CP0008</DiagnosticId>
31-
<Target>T:Microsoft.Build.Framework.LoggerVerbosity</Target>
32-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
33-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
34-
<IsBaselineSuppression>true</IsBaselineSuppression>
35-
</Suppression>
36-
<Suppression>
37-
<DiagnosticId>CP0008</DiagnosticId>
38-
<Target>T:Microsoft.Build.Framework.MessageImportance</Target>
39-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
40-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
41-
<IsBaselineSuppression>true</IsBaselineSuppression>
42-
</Suppression>
43-
<Suppression>
44-
<DiagnosticId>CP0008</DiagnosticId>
45-
<Target>T:Microsoft.Build.Framework.Profiler.EvaluationLocationKind</Target>
46-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
47-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
48-
<IsBaselineSuppression>true</IsBaselineSuppression>
49-
</Suppression>
50-
<Suppression>
51-
<DiagnosticId>CP0008</DiagnosticId>
52-
<Target>T:Microsoft.Build.Framework.Profiler.EvaluationPass</Target>
53-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
54-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
55-
<IsBaselineSuppression>true</IsBaselineSuppression>
56-
</Suppression>
57-
<Suppression>
58-
<DiagnosticId>CP0008</DiagnosticId>
59-
<Target>T:Microsoft.Build.Framework.RegisteredTaskObjectLifetime</Target>
60-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
61-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
62-
<IsBaselineSuppression>true</IsBaselineSuppression>
63-
</Suppression>
64-
<Suppression>
65-
<DiagnosticId>CP0008</DiagnosticId>
66-
<Target>T:Microsoft.Build.Framework.TargetBuiltReason</Target>
67-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
68-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
69-
<IsBaselineSuppression>true</IsBaselineSuppression>
70-
</Suppression>
71-
<Suppression>
72-
<DiagnosticId>CP0008</DiagnosticId>
73-
<Target>T:Microsoft.Build.Framework.TargetSkipReason</Target>
74-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
75-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
76-
<IsBaselineSuppression>true</IsBaselineSuppression>
77-
</Suppression>
78-
<Suppression>
79-
<DiagnosticId>CP0008</DiagnosticId>
80-
<Target>T:Microsoft.Build.Framework.TaskParameterMessageKind</Target>
81-
<Left>ref/net9.0/Microsoft.Build.Framework.dll</Left>
82-
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
83-
<IsBaselineSuppression>true</IsBaselineSuppression>
84-
</Suppression>
854
<Suppression>
865
<DiagnosticId>PKV004</DiagnosticId>
876
<Target>.NETCoreApp,Version=v2.0</Target>
@@ -130,8 +49,4 @@
13049
<DiagnosticId>PKV004</DiagnosticId>
13150
<Target>Xamarin.XboxOne,Version=v0.0</Target>
13251
</Suppression>
133-
<Suppression>
134-
<DiagnosticId>PKV006</DiagnosticId>
135-
<Target>net9.0</Target>
136-
</Suppression>
13752
</Suppressions>

‎src/Tasks/CompatibilitySuppressions.xml‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -67,55 +67,6 @@
6767
<Left>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Left>
6868
<Right>ref/net472/Microsoft.Build.Tasks.Core.dll</Right>
6969
</Suppression>
70-
<Suppression>
71-
<DiagnosticId>CP0008</DiagnosticId>
72-
<Target>T:Microsoft.Build.Tasks.Deployment.Bootstrapper.BuildMessageSeverity</Target>
73-
<Left>ref/net9.0/Microsoft.Build.Tasks.Core.dll</Left>
74-
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
75-
<IsBaselineSuppression>true</IsBaselineSuppression>
76-
</Suppression>
77-
<Suppression>
78-
<DiagnosticId>CP0008</DiagnosticId>
79-
<Target>T:Microsoft.Build.Tasks.Deployment.Bootstrapper.ComponentsLocation</Target>
80-
<Left>ref/net9.0/Microsoft.Build.Tasks.Core.dll</Left>
81-
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
82-
<IsBaselineSuppression>true</IsBaselineSuppression>
83-
</Suppression>
84-
<Suppression>
85-
<DiagnosticId>CP0008</DiagnosticId>
86-
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.AssemblyIdentity.FullNameFlags</Target>
87-
<Left>ref/net9.0/Microsoft.Build.Tasks.Core.dll</Left>
88-
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
89-
<IsBaselineSuppression>true</IsBaselineSuppression>
90-
</Suppression>
91-
<Suppression>
92-
<DiagnosticId>CP0008</DiagnosticId>
93-
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.AssemblyReferenceType</Target>
94-
<Left>ref/net9.0/Microsoft.Build.Tasks.Core.dll</Left>
95-
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
96-
<IsBaselineSuppression>true</IsBaselineSuppression>
97-
</Suppression>
98-
<Suppression>
99-
<DiagnosticId>CP0008</DiagnosticId>
100-
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.OutputMessageType</Target>
101-
<Left>ref/net9.0/Microsoft.Build.Tasks.Core.dll</Left>
102-
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
103-
<IsBaselineSuppression>true</IsBaselineSuppression>
104-
</Suppression>
105-
<Suppression>
106-
<DiagnosticId>CP0008</DiagnosticId>
107-
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.UpdateMode</Target>
108-
<Left>ref/net9.0/Microsoft.Build.Tasks.Core.dll</Left>
109-
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
110-
<IsBaselineSuppression>true</IsBaselineSuppression>
111-
</Suppression>
112-
<Suppression>
113-
<DiagnosticId>CP0008</DiagnosticId>
114-
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.UpdateUnit</Target>
115-
<Left>ref/net9.0/Microsoft.Build.Tasks.Core.dll</Left>
116-
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
117-
<IsBaselineSuppression>true</IsBaselineSuppression>
118-
</Suppression>
11970
<Suppression>
12071
<DiagnosticId>PKV004</DiagnosticId>
12172
<Target>.NETCoreApp,Version=v2.0</Target>
@@ -164,8 +115,4 @@
164115
<DiagnosticId>PKV004</DiagnosticId>
165116
<Target>Xamarin.XboxOne,Version=v0.0</Target>
166117
</Suppression>
167-
<Suppression>
168-
<DiagnosticId>PKV006</DiagnosticId>
169-
<Target>net9.0</Target>
170-
</Suppression>
171118
</Suppressions>

‎src/Utilities/CompatibilitySuppressions.xml‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- https://learn.microsoft.com/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-
<Suppression>
5-
<DiagnosticId>CP0008</DiagnosticId>
6-
<Target>T:Microsoft.Build.Utilities.DotNetFrameworkArchitecture</Target>
7-
<Left>ref/net9.0/Microsoft.Build.Utilities.Core.dll</Left>
8-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
9-
<IsBaselineSuppression>true</IsBaselineSuppression>
10-
</Suppression>
11-
<Suppression>
12-
<DiagnosticId>CP0008</DiagnosticId>
13-
<Target>T:Microsoft.Build.Utilities.HostObjectInitializationStatus</Target>
14-
<Left>ref/net9.0/Microsoft.Build.Utilities.Core.dll</Left>
15-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
16-
<IsBaselineSuppression>true</IsBaselineSuppression>
17-
</Suppression>
18-
<Suppression>
19-
<DiagnosticId>CP0008</DiagnosticId>
20-
<Target>T:Microsoft.Build.Utilities.MultipleVersionSupport</Target>
21-
<Left>ref/net9.0/Microsoft.Build.Utilities.Core.dll</Left>
22-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
23-
<IsBaselineSuppression>true</IsBaselineSuppression>
24-
</Suppression>
25-
<Suppression>
26-
<DiagnosticId>CP0008</DiagnosticId>
27-
<Target>T:Microsoft.Build.Utilities.SDKType</Target>
28-
<Left>ref/net9.0/Microsoft.Build.Utilities.Core.dll</Left>
29-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
30-
<IsBaselineSuppression>true</IsBaselineSuppression>
31-
</Suppression>
32-
<Suppression>
33-
<DiagnosticId>CP0008</DiagnosticId>
34-
<Target>T:Microsoft.Build.Utilities.TargetDotNetFrameworkVersion</Target>
35-
<Left>ref/net9.0/Microsoft.Build.Utilities.Core.dll</Left>
36-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
37-
<IsBaselineSuppression>true</IsBaselineSuppression>
38-
</Suppression>
39-
<Suppression>
40-
<DiagnosticId>CP0008</DiagnosticId>
41-
<Target>T:Microsoft.Build.Utilities.VisualStudioVersion</Target>
42-
<Left>ref/net9.0/Microsoft.Build.Utilities.Core.dll</Left>
43-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
44-
<IsBaselineSuppression>true</IsBaselineSuppression>
45-
</Suppression>
46-
47-
<!-- Intentional source-breaking but not binary-breaking change pattern for VersionLatest -->
48-
<Suppression>
49-
<DiagnosticId>CP0011</DiagnosticId>
50-
<Target>F:Microsoft.Build.Utilities.VisualStudioVersion.VersionLatest</Target>
51-
<Left>lib/net472/Microsoft.Build.Utilities.Core.dll</Left>
52-
<Right>lib/net472/Microsoft.Build.Utilities.Core.dll</Right>
53-
<IsBaselineSuppression>true</IsBaselineSuppression>
54-
</Suppression>
55-
<Suppression>
56-
<DiagnosticId>CP0011</DiagnosticId>
57-
<Target>F:Microsoft.Build.Utilities.VisualStudioVersion.VersionLatest</Target>
58-
<Left>ref/net472/Microsoft.Build.Utilities.Core.dll</Left>
59-
<Right>ref/net472/Microsoft.Build.Utilities.Core.dll</Right>
60-
<IsBaselineSuppression>true</IsBaselineSuppression>
61-
</Suppression>
62-
<Suppression>
63-
<DiagnosticId>CP0011</DiagnosticId>
64-
<Target>F:Microsoft.Build.Utilities.VisualStudioVersion.VersionLatest</Target>
65-
<Left>ref/net9.0/Microsoft.Build.Utilities.Core.dll</Left>
66-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
67-
<IsBaselineSuppression>true</IsBaselineSuppression>
68-
</Suppression>
69-
<Suppression>
70-
<DiagnosticId>CP0011</DiagnosticId>
71-
<Target>F:Microsoft.Build.Utilities.VisualStudioVersion.VersionLatest</Target>
72-
<Left>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Left>
73-
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
74-
<IsBaselineSuppression>true</IsBaselineSuppression>
75-
</Suppression>
76-
774
<Suppression>
785
<DiagnosticId>PKV004</DiagnosticId>
796
<Target>.NETCoreApp,Version=v2.0</Target>
@@ -122,8 +49,4 @@
12249
<DiagnosticId>PKV004</DiagnosticId>
12350
<Target>Xamarin.XboxOne,Version=v0.0</Target>
12451
</Suppression>
125-
<Suppression>
126-
<DiagnosticId>PKV006</DiagnosticId>
127-
<Target>net9.0</Target>
128-
</Suppression>
12952
</Suppressions>

0 commit comments

Comments
 (0)