From aa5b3cf4c259ac793d345baf8a863abb8c18d28f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Apr 2023 14:32:30 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20230405.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23177.4 -> To Version 8.0.0-beta.23205.4 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23175-02 -> To Version 1.2.0-beta-23202-01 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f204c983b..b1d0f5571 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b - + https://github.com/dotnet/arcade - 747f53d751983dd062f39f4654bff074536e0012 + 290a3ecc0e3dabcdcafff632ccbf28d42db8061b https://github.com/dotnet/arcade-services @@ -223,14 +223,14 @@ 09c4d8e93c5b78897bccb4f27e0c373647fb3985 - + https://github.com/dotnet/sourcelink - ccfca8dce5f7525433756281c2c275386348a9ad + 47edfd68f25fc5a9dd399b6e3f8f20a355f82e1a - + https://github.com/dotnet/xliff-tasks - f8afbbadc5b87ae70b8993f4a9cfa54fb820d6ce + a0d9b0e10c67721157c066abb9210d1e3e774014 diff --git a/eng/Versions.props b/eng/Versions.props index f51ea8e77..d72e2f6a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23177.4 + 8.0.0-beta.23205.4 diff --git a/global.json b/global.json index 93b4ed949..8e0ab15e1 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23177.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23177.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23205.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23205.4" } } From 37b0180fc0512cc61fd8c8e160c82a949464cca5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Apr 2023 22:59:50 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/arcade build 20230407.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23177.4 -> To Version 8.0.0-beta.23207.1 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23175-02 -> To Version 1.2.0-beta-23205-03 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0cd142cdf..f503d9041 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e3bfcab7b00a6345c005dad16474d2ad29d6587d - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e3bfcab7b00a6345c005dad16474d2ad29d6587d - + https://github.com/dotnet/arcade - 290a3ecc0e3dabcdcafff632ccbf28d42db8061b + e3bfcab7b00a6345c005dad16474d2ad29d6587d https://github.com/dotnet/arcade-services @@ -223,9 +223,9 @@ 9d5fc54b0d8b201e6fcc4f894ee8d5bf8611e681 - + https://github.com/dotnet/sourcelink - 47edfd68f25fc5a9dd399b6e3f8f20a355f82e1a + c30453767037d81a9ab925f82736a9738004f309 diff --git a/eng/Versions.props b/eng/Versions.props index 9739bce72..c30be9a74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23205.4 + 8.0.0-beta.23207.1 diff --git a/global.json b/global.json index 8e0ab15e1..5f68760b3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23205.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23205.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23207.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23207.1" } } From 23f565e53553f0bd307c06c16cf7c9a17ea510fe Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Apr 2023 21:31:49 +0000 Subject: [PATCH 3/7] Add sourcelink patch to unblock source-build --- .../sourcelink/0002-Fix-FileWrites-995.patch | 276 ++++++++++++++++++ 1 file changed, 276 insertions(+) create mode 100644 src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch diff --git a/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch b/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch new file mode 100644 index 000000000..509e25465 --- /dev/null +++ b/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch @@ -0,0 +1,276 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= + +Date: Mon, 10 Apr 2023 14:25:53 -0700 +Subject: [PATCH] Fix FileWrites (#995) + +Backport: https://github.com/dotnet/sourcelink/issues/993 +--- + .../GenerateSourceLinkFileTests.cs | 4 -- + .../GenerateSourceLinkFile.cs | 16 +---- + .../build/Microsoft.SourceLink.Common.targets | 11 +++- + .../CloudHostedProvidersTests.cs | 61 ++++++++++++++----- + 4 files changed, 56 insertions(+), 36 deletions(-) + +diff --git a/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs b/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs +index 50ecb7c..9234421 100644 +--- a/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs ++++ b/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs +@@ -40,7 +40,6 @@ public void Empty(bool noWarning) + AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedOutput, engine.Log); + + Assert.Null(task.SourceLink); +- Assert.Null(task.FileWrite); + } + + [Theory] +@@ -73,7 +72,6 @@ public void NoRepositoryUrl(bool noWarning) + AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedOutput, engine.Log); + + Assert.Null(task.SourceLink); +- Assert.Null(task.FileWrite); + } + + [Fact] +@@ -100,7 +98,6 @@ public void Empty_DeleteExistingFile() + string.Format(Resources.SourceLinkEmptyDeletingExistingFile, sourceLinkFile.Path), engine.Log); + + Assert.Null(task.SourceLink); +- Assert.Equal(sourceLinkFile.Path, task.FileWrite); + } + + [Fact] +@@ -235,7 +232,6 @@ public void DoesNotRewriteContentIfFileContentIsSame() + + Assert.Equal(@"{""documents"":{""/_\""_/*"":""https://raw.githubusercontent.com/repo/*""}}", File.ReadAllText(tempFile.Path, Encoding.UTF8)); + Assert.Equal(tempFile.Path, task.SourceLink); +- Assert.Equal(tempFile.Path, task.FileWrite); + + result = task.Execute(); + +diff --git a/src/SourceLink.Common/GenerateSourceLinkFile.cs b/src/SourceLink.Common/GenerateSourceLinkFile.cs +index 8a07616..859cf0d 100644 +--- a/src/SourceLink.Common/GenerateSourceLinkFile.cs ++++ b/src/SourceLink.Common/GenerateSourceLinkFile.cs +@@ -21,12 +21,6 @@ public sealed class GenerateSourceLinkFile : Task + [Required, NotNull] + public string? OutputFile { get; set; } + +- /// +- /// Set to if the output file was written to, null otherwise. +- /// +- [Output] +- public string? FileWrite { get; set; } +- + /// + /// Set to if the output Source Link file should be passed to the compiler. + /// +@@ -60,14 +54,14 @@ static string jsonEscape(string str) + + if (!localPath.EndsWithSeparator()) + { +- Log.LogError(Resources.MustEndWithDirectorySeparator, (isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name), localPath); ++ Log.LogError(Resources.MustEndWithDirectorySeparator, isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name, localPath); + success = false; + continue; + } + + if (localPath.Contains('*')) + { +- Log.LogError(Resources.MustNotContainWildcard, (isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name), localPath); ++ Log.LogError(Resources.MustNotContainWildcard, isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name, localPath); + success = false; + continue; + } +@@ -127,7 +121,6 @@ private void WriteSourceLinkFile(string? content) + Log.LogMessage(Resources.SourceLinkEmptyDeletingExistingFile, OutputFile); + + File.Delete(OutputFile); +- FileWrite = OutputFile; + return; + } + +@@ -151,14 +144,11 @@ private void WriteSourceLinkFile(string? content) + + Log.LogMessage(Resources.SourceLinkFileUpdated, OutputFile); + File.WriteAllText(OutputFile, content); +- FileWrite = SourceLink = OutputFile; ++ SourceLink = OutputFile; + } + catch (Exception e) + { + Log.LogError(Resources.ErrorWritingToSourceLinkFile, OutputFile, e.Message); +- +- // Part of the file might have been written. +- FileWrite = OutputFile; + } + } + } +diff --git a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets +index ea05b19..0f9a861 100644 +--- a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets ++++ b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets +@@ -58,11 +58,16 @@ + + + +- +- +- + + ++ ++ ++ ++ ++ + + + +diff --git a/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs b/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs +index 8a91a9a..58129d0 100644 +--- a/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs ++++ b/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs +@@ -131,6 +131,11 @@ public void NoCommit_NoRemote_NoWarnings() + + + ++ ++ ++ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> ++ ++ + """, + customTargets: "", + targets: new[] +@@ -141,11 +146,13 @@ public void NoCommit_NoRemote_NoWarnings() + { + "@(SourceRoot)", + "$(SourceLink)", ++ "@(_SourceLinkFileWrites)", + }, + expectedResults: new[] + { + NuGetPackageFolders, + "", ++ "", + }); + } + +@@ -160,6 +167,11 @@ public void Commit_NoRemote_NoWarnings() + + + ++ ++ ++ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> ++ ++ + """, + customTargets: "", + targets: new[] +@@ -170,12 +182,14 @@ public void Commit_NoRemote_NoWarnings() + { + "@(SourceRoot)", + "$(SourceLink)", ++ "@(_SourceLinkFileWrites)", + }, + expectedResults: new[] + { + NuGetPackageFolders, + ProjectSourceRoot, + "", ++ "", + }); + } + +@@ -190,6 +204,11 @@ public void NoCommit_Remote_NoWarnings() + + + ++ ++ ++ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> ++ ++ + """, + customTargets: "", + targets: new[] +@@ -200,11 +219,13 @@ public void NoCommit_Remote_NoWarnings() + { + "@(SourceRoot)", + "$(SourceLink)", ++ "@(_SourceLinkFileWrites)", + }, + expectedResults: new[] + { + NuGetPackageFolders, + "", ++ "", + }); + } + +@@ -230,21 +251,27 @@ public void CustomTranslation() + DependsOnTargets=""$(SourceControlManagerUrlTranslationTargets)"" + BeforeTargets=""SourceControlManagerPublishTranslatedUrls""> + +- +- <_Pattern>https://([^.]+)[.]visualstudio.com/([^/]+)/_git/([^/]+) +- <_Replacement>https://github.com/$2/$3 +- +- +- +- $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) +- +- +- +- +- $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) +- +- +- ++ ++ <_Pattern>https://([^.]+)[.]visualstudio.com/([^/]+)/_git/([^/]+) ++ <_Replacement>https://github.com/$2/$3 ++ ++ ++ ++ $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) ++ ++ ++ ++ ++ $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) ++ ++ ++ ++ ++ ++ ++ <_SourceLinkFileWrites Include=""@(FileWrites)"" Condition=""$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))""/> ++ ++ + ", + targets: new[] + { +@@ -256,7 +283,8 @@ public void CustomTranslation() + "@(SourceRoot->'%(SourceLinkUrl)')", + "$(SourceLink)", + "$(PrivateRepositoryUrl)", +- "$(RepositoryUrl)" ++ "$(RepositoryUrl)", ++ "@(_SourceLinkFileWrites)", + }, + expectedResults: new[] + { +@@ -266,6 +294,7 @@ public void CustomTranslation() + s_relativeSourceLinkJsonPath, + $"https://github.com/test-org/{repoName}", + $"https://github.com/test-org/{repoName}", ++ s_relativeSourceLinkJsonPath + }); + + AssertEx.AreEqual( From 8adfab91ad5c96074de1c8edd9721e3dcc43bde2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Apr 2023 22:10:22 +0000 Subject: [PATCH 4/7] Revert sourcelink patch, will need to flow in latest version --- .../sourcelink/0002-Fix-FileWrites-995.patch | 276 ------------------ 1 file changed, 276 deletions(-) delete mode 100644 src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch diff --git a/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch b/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch deleted file mode 100644 index 509e25465..000000000 --- a/src/SourceBuild/patches/sourcelink/0002-Fix-FileWrites-995.patch +++ /dev/null @@ -1,276 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= - -Date: Mon, 10 Apr 2023 14:25:53 -0700 -Subject: [PATCH] Fix FileWrites (#995) - -Backport: https://github.com/dotnet/sourcelink/issues/993 ---- - .../GenerateSourceLinkFileTests.cs | 4 -- - .../GenerateSourceLinkFile.cs | 16 +---- - .../build/Microsoft.SourceLink.Common.targets | 11 +++- - .../CloudHostedProvidersTests.cs | 61 ++++++++++++++----- - 4 files changed, 56 insertions(+), 36 deletions(-) - -diff --git a/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs b/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs -index 50ecb7c..9234421 100644 ---- a/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs -+++ b/src/SourceLink.Common.UnitTests/GenerateSourceLinkFileTests.cs -@@ -40,7 +40,6 @@ public void Empty(bool noWarning) - AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedOutput, engine.Log); - - Assert.Null(task.SourceLink); -- Assert.Null(task.FileWrite); - } - - [Theory] -@@ -73,7 +72,6 @@ public void NoRepositoryUrl(bool noWarning) - AssertEx.AssertEqualToleratingWhitespaceDifferences(expectedOutput, engine.Log); - - Assert.Null(task.SourceLink); -- Assert.Null(task.FileWrite); - } - - [Fact] -@@ -100,7 +98,6 @@ public void Empty_DeleteExistingFile() - string.Format(Resources.SourceLinkEmptyDeletingExistingFile, sourceLinkFile.Path), engine.Log); - - Assert.Null(task.SourceLink); -- Assert.Equal(sourceLinkFile.Path, task.FileWrite); - } - - [Fact] -@@ -235,7 +232,6 @@ public void DoesNotRewriteContentIfFileContentIsSame() - - Assert.Equal(@"{""documents"":{""/_\""_/*"":""https://raw.githubusercontent.com/repo/*""}}", File.ReadAllText(tempFile.Path, Encoding.UTF8)); - Assert.Equal(tempFile.Path, task.SourceLink); -- Assert.Equal(tempFile.Path, task.FileWrite); - - result = task.Execute(); - -diff --git a/src/SourceLink.Common/GenerateSourceLinkFile.cs b/src/SourceLink.Common/GenerateSourceLinkFile.cs -index 8a07616..859cf0d 100644 ---- a/src/SourceLink.Common/GenerateSourceLinkFile.cs -+++ b/src/SourceLink.Common/GenerateSourceLinkFile.cs -@@ -21,12 +21,6 @@ public sealed class GenerateSourceLinkFile : Task - [Required, NotNull] - public string? OutputFile { get; set; } - -- /// -- /// Set to if the output file was written to, null otherwise. -- /// -- [Output] -- public string? FileWrite { get; set; } -- - /// - /// Set to if the output Source Link file should be passed to the compiler. - /// -@@ -60,14 +54,14 @@ static string jsonEscape(string str) - - if (!localPath.EndsWithSeparator()) - { -- Log.LogError(Resources.MustEndWithDirectorySeparator, (isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name), localPath); -+ Log.LogError(Resources.MustEndWithDirectorySeparator, isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name, localPath); - success = false; - continue; - } - - if (localPath.Contains('*')) - { -- Log.LogError(Resources.MustNotContainWildcard, (isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name), localPath); -+ Log.LogError(Resources.MustNotContainWildcard, isMapped ? Names.SourceRoot.MappedPathFullName : Names.SourceRoot.Name, localPath); - success = false; - continue; - } -@@ -127,7 +121,6 @@ private void WriteSourceLinkFile(string? content) - Log.LogMessage(Resources.SourceLinkEmptyDeletingExistingFile, OutputFile); - - File.Delete(OutputFile); -- FileWrite = OutputFile; - return; - } - -@@ -151,14 +144,11 @@ private void WriteSourceLinkFile(string? content) - - Log.LogMessage(Resources.SourceLinkFileUpdated, OutputFile); - File.WriteAllText(OutputFile, content); -- FileWrite = SourceLink = OutputFile; -+ SourceLink = OutputFile; - } - catch (Exception e) - { - Log.LogError(Resources.ErrorWritingToSourceLinkFile, OutputFile, e.Message); -- -- // Part of the file might have been written. -- FileWrite = OutputFile; - } - } - } -diff --git a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets -index ea05b19..0f9a861 100644 ---- a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets -+++ b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets -@@ -58,11 +58,16 @@ - - - -- -- -- - - -+ -+ -+ -+ -+ - - - -diff --git a/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs b/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs -index 8a91a9a..58129d0 100644 ---- a/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs -+++ b/src/SourceLink.Git.IntegrationTests/CloudHostedProvidersTests.cs -@@ -131,6 +131,11 @@ public void NoCommit_NoRemote_NoWarnings() - - - -+ -+ -+ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> -+ -+ - """, - customTargets: "", - targets: new[] -@@ -141,11 +146,13 @@ public void NoCommit_NoRemote_NoWarnings() - { - "@(SourceRoot)", - "$(SourceLink)", -+ "@(_SourceLinkFileWrites)", - }, - expectedResults: new[] - { - NuGetPackageFolders, - "", -+ "", - }); - } - -@@ -160,6 +167,11 @@ public void Commit_NoRemote_NoWarnings() - - - -+ -+ -+ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> -+ -+ - """, - customTargets: "", - targets: new[] -@@ -170,12 +182,14 @@ public void Commit_NoRemote_NoWarnings() - { - "@(SourceRoot)", - "$(SourceLink)", -+ "@(_SourceLinkFileWrites)", - }, - expectedResults: new[] - { - NuGetPackageFolders, - ProjectSourceRoot, - "", -+ "", - }); - } - -@@ -190,6 +204,11 @@ public void NoCommit_Remote_NoWarnings() - - - -+ -+ -+ <_SourceLinkFileWrites Include="@(FileWrites)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))"/> -+ -+ - """, - customTargets: "", - targets: new[] -@@ -200,11 +219,13 @@ public void NoCommit_Remote_NoWarnings() - { - "@(SourceRoot)", - "$(SourceLink)", -+ "@(_SourceLinkFileWrites)", - }, - expectedResults: new[] - { - NuGetPackageFolders, - "", -+ "", - }); - } - -@@ -230,21 +251,27 @@ public void CustomTranslation() - DependsOnTargets=""$(SourceControlManagerUrlTranslationTargets)"" - BeforeTargets=""SourceControlManagerPublishTranslatedUrls""> - -- -- <_Pattern>https://([^.]+)[.]visualstudio.com/([^/]+)/_git/([^/]+) -- <_Replacement>https://github.com/$2/$3 -- -- -- -- $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) -- -- -- -- -- $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) -- -- -- -+ -+ <_Pattern>https://([^.]+)[.]visualstudio.com/([^/]+)/_git/([^/]+) -+ <_Replacement>https://github.com/$2/$3 -+ -+ -+ -+ $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) -+ -+ -+ -+ -+ $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) -+ -+ -+ -+ -+ -+ -+ <_SourceLinkFileWrites Include=""@(FileWrites)"" Condition=""$([MSBuild]::ValueOrDefault('%(Identity)', '').EndsWith('sourcelink.json'))""/> -+ -+ - ", - targets: new[] - { -@@ -256,7 +283,8 @@ public void CustomTranslation() - "@(SourceRoot->'%(SourceLinkUrl)')", - "$(SourceLink)", - "$(PrivateRepositoryUrl)", -- "$(RepositoryUrl)" -+ "$(RepositoryUrl)", -+ "@(_SourceLinkFileWrites)", - }, - expectedResults: new[] - { -@@ -266,6 +294,7 @@ public void CustomTranslation() - s_relativeSourceLinkJsonPath, - $"https://github.com/test-org/{repoName}", - $"https://github.com/test-org/{repoName}", -+ s_relativeSourceLinkJsonPath - }); - - AssertEx.AreEqual( From 2d5475e1cd5108ad3a661de30717cc494cbb4a73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Apr 2023 23:10:57 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230410.5 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23210.4 -> To Version 8.0.0-alpha.1.23210.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c8ded109..98410e35f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,9 +218,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 8632a4c5dd73725869fc33f1c466d81b2667386f + f43e7ac7040fa13408a8c2475e5ba76f33402ad2 From e26eba9782188549dcf48844ca236b38994b27a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Apr 2023 01:23:20 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/arcade build 20230410.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23177.4 -> To Version 8.0.0-beta.23210.2 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-23175-02 -> To Version 1.2.0-beta-23205-03 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f503d9041..c16d3fc4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - e3bfcab7b00a6345c005dad16474d2ad29d6587d + 999d8ef7cd34c754502a1fa6b17b19c3eb42348c - + https://github.com/dotnet/arcade - e3bfcab7b00a6345c005dad16474d2ad29d6587d + 999d8ef7cd34c754502a1fa6b17b19c3eb42348c - + https://github.com/dotnet/arcade - e3bfcab7b00a6345c005dad16474d2ad29d6587d + 999d8ef7cd34c754502a1fa6b17b19c3eb42348c https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index c30be9a74..7bab9f75b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23207.1 + 8.0.0-beta.23210.2 diff --git a/global.json b/global.json index 5f68760b3..706841059 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23207.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23207.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.2" } } From a8a1a0e8a5acc4fec80e71eb00f5d9d653a58410 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 10 Apr 2023 21:08:29 -0500 Subject: [PATCH 7/7] Manually updating to latest arcade since darc is failing to do so --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c16d3fc4c..fbc2ccad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,18 +193,18 @@ - + https://github.com/dotnet/arcade - 999d8ef7cd34c754502a1fa6b17b19c3eb42348c + e5c569253a4cecd110830acbf1ffae96d5a37cc6 - + https://github.com/dotnet/arcade - 999d8ef7cd34c754502a1fa6b17b19c3eb42348c + e5c569253a4cecd110830acbf1ffae96d5a37cc6 - + https://github.com/dotnet/arcade - 999d8ef7cd34c754502a1fa6b17b19c3eb42348c + e5c569253a4cecd110830acbf1ffae96d5a37cc6 https://github.com/dotnet/arcade-services @@ -223,9 +223,9 @@ 9d5fc54b0d8b201e6fcc4f894ee8d5bf8611e681 - + https://github.com/dotnet/sourcelink - c30453767037d81a9ab925f82736a9738004f309 + 759f344923a0859f3fae83431d0ba1cc62108118 diff --git a/eng/Versions.props b/eng/Versions.props index 7bab9f75b..6792592ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 8.0.0-beta.23210.2 + 8.0.0-beta.23210.3 diff --git a/global.json b/global.json index 706841059..81617e22f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23210.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23210.3" } }