diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index daf200ae88e..8a510969e39 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -15,9 +15,9 @@ jobs: $isVersionBumped = $false if ($changedVersionsFile -ne $null) { $difference = git diff HEAD~1 $versionsFile - $changedContent = $difference -join " " + $changedContent = $difference -join "%" # 'DotNetFinalVersionKind' is expected to be added only during the initial setup of the release branch - $initialCommitPattern = '-\s*\d+\.\d+\.\d+<\/VersionPrefix> \+\s*\d+\.\d+\.\d+<\/VersionPrefix>.*release<\/DotNetFinalVersionKind>' + $initialCommitPattern = '-\s*\d+\.\d+\.\d+<\/VersionPrefix>%.*\+\s*\d+\.\d+\.\d+<\/VersionPrefix>release<\/DotNetFinalVersionKind>' $isInitialCommit = $changedContent -match $initialCommitPattern $pattern = '-\s*\d+\.\d+\.(?\d+)<\/VersionPrefix>.* \+\s*\d+\.\d+\.(?\d+)<\/VersionPrefix>' if (!($isInitialCommit) -and ($changedContent -match $pattern)) { diff --git a/eng/Versions.props b/eng/Versions.props index aa03d3e5544..9e02c085485 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,8 +2,8 @@ - 17.11.0 - 17.8.3 + 17.11.0release + 17.10.4 15.1.0.0 preview true diff --git a/src/Build/CompatibilitySuppressions.xml b/src/Build/CompatibilitySuppressions.xml deleted file mode 100644 index 85a8e28b087..00000000000 --- a/src/Build/CompatibilitySuppressions.xml +++ /dev/null @@ -1,292 +0,0 @@ - - - - - CP0001 - T:Microsoft.Build.Logging.IBuildEventStringsReader - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0001 - T:Microsoft.Build.Logging.IBuildEventStringsReader - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0001 - T:Microsoft.Build.Logging.IBuildEventStringsReader - ref/net472/Microsoft.Build.dll - ref/net472/Microsoft.Build.dll - true - - - CP0001 - T:Microsoft.Build.Logging.IBuildEventStringsReader - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BinaryLogReplayEventSource.add_NotificationsSourceCreated(System.Action{Microsoft.Build.Logging.IBuildEventArgsReaderNotifications}) - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BinaryLogReplayEventSource.remove_NotificationsSourceCreated(System.Action{Microsoft.Build.Logging.IBuildEventArgsReaderNotifications}) - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BuildEventArgsReader.add_StringEncountered(System.Action) - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BuildEventArgsReader.remove_StringEncountered(System.Action) - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BinaryLogReplayEventSource.add_NotificationsSourceCreated(System.Action{Microsoft.Build.Logging.IBuildEventArgsReaderNotifications}) - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BinaryLogReplayEventSource.remove_NotificationsSourceCreated(System.Action{Microsoft.Build.Logging.IBuildEventArgsReaderNotifications}) - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BuildEventArgsReader.add_StringEncountered(System.Action) - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BuildEventArgsReader.remove_StringEncountered(System.Action) - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BinaryLogReplayEventSource.add_NotificationsSourceCreated(System.Action{Microsoft.Build.Logging.IBuildEventArgsReaderNotifications}) - ref/net472/Microsoft.Build.dll - ref/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BinaryLogReplayEventSource.remove_NotificationsSourceCreated(System.Action{Microsoft.Build.Logging.IBuildEventArgsReaderNotifications}) - ref/net472/Microsoft.Build.dll - ref/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BuildEventArgsReader.add_StringEncountered(System.Action) - ref/net472/Microsoft.Build.dll - ref/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BuildEventArgsReader.remove_StringEncountered(System.Action) - ref/net472/Microsoft.Build.dll - ref/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BinaryLogReplayEventSource.add_NotificationsSourceCreated(System.Action{Microsoft.Build.Logging.IBuildEventArgsReaderNotifications}) - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BinaryLogReplayEventSource.remove_NotificationsSourceCreated(System.Action{Microsoft.Build.Logging.IBuildEventArgsReaderNotifications}) - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BuildEventArgsReader.add_StringEncountered(System.Action) - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Logging.BuildEventArgsReader.remove_StringEncountered(System.Action) - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.ArchiveFileEncountered - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.RecoverableReadError - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.StringReadDone - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.ArchiveFileEncountered - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.RecoverableReadError - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.StringReadDone - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.ArchiveFileEncountered - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.RecoverableReadError - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0006 - E:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications.StringReadDone - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0008 - T:Microsoft.Build.Logging.BuildEventArgsReader - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0008 - T:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0008 - T:Microsoft.Build.Logging.BuildEventArgsReader - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0008 - T:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0008 - T:Microsoft.Build.Logging.BuildEventArgsReader - ref/net472/Microsoft.Build.dll - ref/net472/Microsoft.Build.dll - true - - - CP0008 - T:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications - ref/net472/Microsoft.Build.dll - ref/net472/Microsoft.Build.dll - true - - - CP0008 - T:Microsoft.Build.Logging.BuildEventArgsReader - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - CP0008 - T:Microsoft.Build.Logging.IBuildEventArgsReaderNotifications - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - - - CP0002 - M:Microsoft.Build.Experimental.FileAccess.FileAccessData.#ctor(Microsoft.Build.Experimental.FileAccess.ReportedFileOperation,Microsoft.Build.Experimental.FileAccess.RequestedAccess,System.UInt32,System.UInt32,Microsoft.Build.Experimental.FileAccess.DesiredAccess,Microsoft.Build.Experimental.FileAccess.FlagsAndAttributes,System.String,System.String,System.Boolean) - lib/net472/Microsoft.Build.dll - lib/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Experimental.FileAccess.FileAccessData.#ctor(Microsoft.Build.Experimental.FileAccess.ReportedFileOperation,Microsoft.Build.Experimental.FileAccess.RequestedAccess,System.UInt32,System.UInt32,Microsoft.Build.Experimental.FileAccess.DesiredAccess,Microsoft.Build.Experimental.FileAccess.FlagsAndAttributes,System.String,System.String,System.Boolean) - lib/net8.0/Microsoft.Build.dll - lib/net8.0/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Experimental.FileAccess.FileAccessData.#ctor(Microsoft.Build.Experimental.FileAccess.ReportedFileOperation,Microsoft.Build.Experimental.FileAccess.RequestedAccess,System.UInt32,System.UInt32,Microsoft.Build.Experimental.FileAccess.DesiredAccess,Microsoft.Build.Experimental.FileAccess.FlagsAndAttributes,System.String,System.String,System.Boolean) - ref/net472/Microsoft.Build.dll - ref/net472/Microsoft.Build.dll - true - - - CP0002 - M:Microsoft.Build.Experimental.FileAccess.FileAccessData.#ctor(Microsoft.Build.Experimental.FileAccess.ReportedFileOperation,Microsoft.Build.Experimental.FileAccess.RequestedAccess,System.UInt32,System.UInt32,Microsoft.Build.Experimental.FileAccess.DesiredAccess,Microsoft.Build.Experimental.FileAccess.FlagsAndAttributes,System.String,System.String,System.Boolean) - ref/net8.0/Microsoft.Build.dll - ref/net8.0/Microsoft.Build.dll - true - - \ No newline at end of file diff --git a/src/BuildCheck.UnitTests/EndToEndTests.cs b/src/BuildCheck.UnitTests/EndToEndTests.cs index 98d53d0e384..c97df427637 100644 --- a/src/BuildCheck.UnitTests/EndToEndTests.cs +++ b/src/BuildCheck.UnitTests/EndToEndTests.cs @@ -134,7 +134,7 @@ public void SampleAnalyzerIntegrationTest(bool buildInOutOfProcessNode, bool ana } } - [Theory] + [Theory(Skip = "https://github.com/dotnet/msbuild/issues/10277")] [InlineData("AnalysisCandidate", new[] { "CustomRule1", "CustomRule2" })] [InlineData("AnalysisCandidateWithMultipleAnalyzersInjected", new[] { "CustomRule1", "CustomRule2", "CustomRule3" }, true)] public void CustomAnalyzerTest(string analysisCandidate, string[] expectedRegisteredRules, bool expectedRejectedAnalyzers = false)