Skip to content

Branding for 17.13 #10703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 1, 2024
+19 −516
Merged

Branding for 17.13 #10703

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c60e568
Bump version and update package validation baseline version
maridematte Sep 25, 2024
04af713
Disabled customCheck tests
maridematte Sep 25, 2024
d07ecf9
disable missed test
maridematte Sep 25, 2024
cfc77b3
Preserve comments on compat file
maridematte Sep 26, 2024
492a279
undo changes in PackageValidationBaselineVersion
YuliiaKovalova Oct 1, 2024
7b67355
bump PackageValidationBaselineVersion
YuliiaKovalova Oct 1, 2024
0605abf
change baseline version
YuliiaKovalova Oct 1, 2024
76ff167
remove extra suppressions
YuliiaKovalova Oct 1, 2024
64f6354
remove suppression
YuliiaKovalova Oct 1, 2024
c80d235
change suppressions
YuliiaKovalova Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<PropertyGroup>
<VersionPrefix>17.12.0</VersionPrefix>
<PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
<VersionPrefix>17.13.0</VersionPrefix>
<PackageValidationBaselineVersion>17.12.0-preview-24474-03</PackageValidationBaselineVersion>
<AssemblyVersion>15.1.0.0</AssemblyVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
Expand Down
8 changes: 4 additions & 4 deletions src/BuildCheck.UnitTests/EndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public void EditorConfig_SeverityAppliedCorrectly(string BC0101Severity, string?
}
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/10702")]
public void CheckHasAccessToAllConfigs()
{
using (var env = TestEnvironment.Create())
Expand Down Expand Up @@ -454,7 +454,7 @@ public void NoEnvironmentVariableProperty_DeferredProcessing(bool warnAsError, b
}
}

[Theory]
[Theory(Skip = "https://github.com/dotnet/msbuild/issues/10702")]
[InlineData("CheckCandidate", new[] { "CustomRule1", "CustomRule2" })]
[InlineData("CheckCandidateWithMultipleChecksInjected", new[] { "CustomRule1", "CustomRule2", "CustomRule3" }, true)]
public void CustomCheckTest_NoEditorConfig(string checkCandidate, string[] expectedRegisteredRules, bool expectedRejectedChecks = false)
Expand Down Expand Up @@ -487,7 +487,7 @@ public void CustomCheckTest_NoEditorConfig(string checkCandidate, string[] expec
}
}

[Theory]
[Theory(Skip = "https://github.com/dotnet/msbuild/issues/10702")]
[InlineData("CheckCandidate", "X01234", "error", "error X01234")]
[InlineData("CheckCandidateWithMultipleChecksInjected", "X01234", "warning", "warning X01234")]
public void CustomCheckTest_WithEditorConfig(string checkCandidate, string ruleId, string severity, string expectedMessage)
Expand All @@ -514,7 +514,7 @@ public void CustomCheckTest_WithEditorConfig(string checkCandidate, string ruleI
}
}

[Theory]
[Theory(Skip = "https://github.com/dotnet/msbuild/issues/10702")]
[InlineData("X01236", "Something went wrong initializing")]
// These tests are for failure one different points, will be addressed in a different PR
// https://github.com/dotnet/msbuild/issues/10522
Expand Down
85 changes: 2 additions & 83 deletions src/Framework/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>PKV004</DiagnosticId>
Expand Down Expand Up @@ -49,85 +49,4 @@
<DiagnosticId>PKV004</DiagnosticId>
<Target>Xamarin.XboxOne,Version=v0.0</Target>
</Suppression>
<!--
Since we are dropping the .net 8 and retarrgetting to .net 9, we need to suppress the following errors.
The comparison ref/net.8 with ref/netstandard2.0 is not valid anymore.
-->
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.AssemblyLoadingContext</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.FeatureStatus</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.LoggerVerbosity</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.MessageImportance</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.Profiler.EvaluationLocationKind</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.Profiler.EvaluationPass</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.RegisteredTaskObjectLifetime</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.TargetBuiltReason</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.TargetSkipReason</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Framework.TaskParameterMessageKind</Target>
<Left>ref/net8.0/Microsoft.Build.Framework.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Framework.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<!--
https://learn.microsoft.com/en-us/dotnet/fundamentals/apicompat/diagnostic-ids
Suppress PKV006 for net8.0 (The target framework is dropped in the latest version.) -->
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net8.0</Target>
</Suppression>
</Suppressions>
</Suppressions>
80 changes: 2 additions & 78 deletions src/Tasks/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<!-- For ease of logging the "not supported on Core" message, these tasks are a
TaskRequiresFramework on netstandard/netcore. Since the type is sealed there,
that shouldn't cause any implementation problems since no one can derive
from it and try to call TaskExtension.Log. -->
<Suppression>
<DiagnosticId>CP0007</DiagnosticId>
<Target>T:Microsoft.Build.Tasks.AL</Target>
Expand Down Expand Up @@ -71,18 +67,6 @@
<Left>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/net472/Microsoft.Build.Tasks.Core.dll</Right>
</Suppression>

<!-- PKV004 for netstandard2.0-supporting TFs that we do not have runtime assemblies for.
This is intentional, because you can only use MSBuild in the context of a .NET SDK
(on net7.0, as of MSBuild 17.4) or in the context of Visual Studio (net472), but we
have previously shipped netstandard2.0 packages, and if you want to support both
runtime contexts it still makes sense to target that. -->

<!-- PKV004 for netstandard2.0-supporting TFs that we do not have runtime assemblies for.
This is intentional, because you can only use MSBuild in the context of a .NET SDK
(on net7.0, as of MSBuild 17.4) or in the context of Visual Studio (net472), but we
have previously shipped netstandard2.0 packages, and if you want to support both
runtime contexts it still makes sense to target that. -->
<Suppression>
<DiagnosticId>PKV004</DiagnosticId>
<Target>.NETCoreApp,Version=v2.0</Target>
Expand Down Expand Up @@ -131,64 +115,4 @@
<DiagnosticId>PKV004</DiagnosticId>
<Target>Xamarin.XboxOne,Version=v0.0</Target>
</Suppression>
<!--
Since we are dropping the .net 8 and retarrgetting to .net 9, we need to suppress the following errors.
The comparison ref/net.8 with ref/netstandard2.0 is not valid anymore.
-->
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Tasks.Deployment.Bootstrapper.BuildMessageSeverity</Target>
<Left>ref/net8.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Tasks.Deployment.Bootstrapper.ComponentsLocation</Target>
<Left>ref/net8.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.AssemblyIdentity.FullNameFlags</Target>
<Left>ref/net8.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.AssemblyReferenceType</Target>
<Left>ref/net8.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.OutputMessageType</Target>
<Left>ref/net8.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.UpdateMode</Target>
<Left>ref/net8.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Tasks.Deployment.ManifestUtilities.UpdateUnit</Target>
<Left>ref/net8.0/Microsoft.Build.Tasks.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Tasks.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<!--
https://learn.microsoft.com/en-us/dotnet/fundamentals/apicompat/diagnostic-ids
Suppress PKV006 for net8.0 (The target framework is dropped in the latest version.) -->
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net8.0</Target>
</Suppression>
</Suppressions>
</Suppressions>
62 changes: 2 additions & 60 deletions src/Utilities/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<!-- PKV004 for netstandard2.0-supporting TFs that we do not have runtime assemblies for.
This is intentional, because you can only use MSBuild in the context of a .NET SDK
(on net7.0, as of MSBuild 17.4) or in the context of Visual Studio (net472), but we
have previously shipped netstandard2.0 packages, and if you want to support both
runtime contexts it still makes sense to target that. -->
<Suppression>
<DiagnosticId>PKV004</DiagnosticId>
<Target>.NETCoreApp,Version=v2.0</Target>
Expand Down Expand Up @@ -54,57 +49,4 @@
<DiagnosticId>PKV004</DiagnosticId>
<Target>Xamarin.XboxOne,Version=v0.0</Target>
</Suppression>
<!--
Since we are dropping the .net 8 and retarrgetting to .net 9, we need to suppress the following errors.
The comparison ref/net.8 with ref/netstandard2.0 is not valid anymore.
-->
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Utilities.DotNetFrameworkArchitecture</Target>
<Left>ref/net8.0/Microsoft.Build.Utilities.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Utilities.HostObjectInitializationStatus</Target>
<Left>ref/net8.0/Microsoft.Build.Utilities.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Utilities.MultipleVersionSupport</Target>
<Left>ref/net8.0/Microsoft.Build.Utilities.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Utilities.SDKType</Target>
<Left>ref/net8.0/Microsoft.Build.Utilities.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Utilities.TargetDotNetFrameworkVersion</Target>
<Left>ref/net8.0/Microsoft.Build.Utilities.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0008</DiagnosticId>
<Target>T:Microsoft.Build.Utilities.VisualStudioVersion</Target>
<Left>ref/net8.0/Microsoft.Build.Utilities.Core.dll</Left>
<Right>ref/netstandard2.0/Microsoft.Build.Utilities.Core.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<!--
https://learn.microsoft.com/en-us/dotnet/fundamentals/apicompat/diagnostic-ids
Suppress PKV006 for net8.0 (The target framework is dropped in the latest version.) -->
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net8.0</Target>
</Suppression>
</Suppressions>
</Suppressions>
Loading