From 772a4ff29f7e420b3acb8d65dfb5cdd686048613 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 18 Apr 2023 11:17:57 +0200 Subject: [PATCH] Clean-up sourcelink repo and remove workarounds 1. Remove license headers from non-shipping assets (project files) 2. Use the Microsoft.Build.NoTargets SDK for content-only packages That avoids invoking the compiler without defining custom targets and makes the repository use the same path as other repositories in the stack. 3. Delete runtimeconfig.template.json in favor of the in-built "..." switch. 4. Remove not needed sourcebuild target. 5. Group dependencies in Versions.props by repositories. Remove the now unneeded Microsoft.NET.Test.Sdk entry. 6. Define target frameworks for source build centrally in one place. 7. Remove unnecessary package dependencies from projects. 8. Apply code styling: - "empty line after Project tag and before closing Project tag" - "empty line between groups (property, item, target)" - "TargetFramework(s) should be the first property in the project" 9. Remove unnecessary PrivateAssets="all" attributes from four ProjectReference items. --- eng/Publishing.props | 9 +++--- eng/SourceBuild.props | 11 +------ eng/Versions.props | 18 ++++++----- eng/runtimeconfig.template.json | 3 -- global.json | 3 +- src/Directory.Build.props | 6 ++-- src/Directory.Build.targets | 11 +++++-- .../Microsoft.Build.StandardCI.csproj | 31 ++++++------------- .../build/Microsoft.Build.StandardCI.props | 5 +-- ...Microsoft.Build.Tasks.Git.UnitTests.csproj | 3 +- .../Microsoft.Build.Tasks.Git.csproj | 16 +++++----- .../build/Microsoft.Build.Tasks.Git.props | 5 +-- .../build/Microsoft.Build.Tasks.Git.targets | 5 ++- .../Microsoft.Build.Tasks.Git.props | 7 +++-- .../Microsoft.Build.Tasks.Git.targets | 7 +++-- .../Microsoft.Build.Tasks.Tfvc.csproj | 13 ++++---- .../build/Microsoft.Build.Tasks.Tfvc.props | 5 +-- .../build/Microsoft.Build.Tasks.Tfvc.targets | 5 ++- .../Microsoft.Build.Tasks.Tfvc.props | 7 +++-- .../Microsoft.Build.Tasks.Tfvc.targets | 7 +++-- ...ink.AzureDevOpsServer.Git.UnitTests.csproj | 9 +++--- ...ft.SourceLink.AzureDevOpsServer.Git.csproj | 24 ++++++++------ ...t.SourceLink.AzureDevOpsServer.Git.targets | 8 ++--- ...t.SourceLink.AzureDevOpsServer.Git.targets | 7 +++-- ...SourceLink.AzureRepos.Git.UnitTests.csproj | 9 +++--- ...Microsoft.SourceLink.AzureRepos.Git.csproj | 24 ++++++++------ .../Microsoft.SourceLink.AzureRepos.Git.props | 5 +-- ...icrosoft.SourceLink.AzureRepos.Git.targets | 6 ++-- .../Microsoft.SourceLink.AzureRepos.Git.props | 7 +++-- ...icrosoft.SourceLink.AzureRepos.Git.targets | 7 +++-- ...icrosoft.SourceLink.AzureRepos.Tfvc.csproj | 12 +++---- ...crosoft.SourceLink.AzureRepos.Tfvc.targets | 4 +-- ...crosoft.SourceLink.AzureRepos.Tfvc.targets | 7 +++-- ....SourceLink.Bitbucket.Git.UnitTests.csproj | 9 +++--- .../Microsoft.SourceLink.Bitbucket.Git.csproj | 24 ++++++++------ .../Microsoft.SourceLink.Bitbucket.Git.props | 7 +++-- ...Microsoft.SourceLink.Bitbucket.Git.targets | 8 ++--- .../Microsoft.SourceLink.Bitbucket.Git.props | 7 +++-- ...Microsoft.SourceLink.Bitbucket.Git.targets | 7 +++-- ...crosoft.SourceLink.Common.UnitTests.csproj | 22 ++++++++----- .../Microsoft.SourceLink.Common.csproj | 15 ++++----- ...InitializeSourceControlInformation.targets | 5 +-- .../build/Microsoft.SourceLink.Common.props | 7 +++-- .../build/Microsoft.SourceLink.Common.targets | 9 +++--- .../Microsoft.SourceLink.Common.props | 7 +++-- .../Microsoft.SourceLink.Common.targets | 6 ++-- ...oft.SourceLink.Git.IntegrationTests.csproj | 9 +++--- ...crosoft.SourceLink.GitHub.UnitTests.csproj | 7 +++-- .../Microsoft.SourceLink.GitHub.csproj | 25 +++++++++------ .../build/Microsoft.SourceLink.GitHub.props | 7 +++-- .../build/Microsoft.SourceLink.GitHub.targets | 8 ++--- .../Microsoft.SourceLink.GitHub.props | 7 +++-- .../Microsoft.SourceLink.GitHub.targets | 7 +++-- ...crosoft.SourceLink.GitLab.UnitTests.csproj | 9 +++--- .../Microsoft.SourceLink.GitLab.csproj | 25 +++++++++------ .../build/Microsoft.SourceLink.GitLab.props | 5 +-- .../build/Microsoft.SourceLink.GitLab.targets | 4 +-- .../Microsoft.SourceLink.GitLab.props | 7 +++-- .../Microsoft.SourceLink.GitLab.targets | 7 +++-- ...crosoft.SourceLink.GitWeb.UnitTests.csproj | 9 +++--- .../Microsoft.SourceLink.GitWeb.csproj | 26 +++++++++------- .../build/Microsoft.SourceLink.GitWeb.targets | 5 +-- .../Microsoft.SourceLink.GitWeb.targets | 7 +++-- ...icrosoft.SourceLink.Gitea.UnitTests.csproj | 9 +++--- .../Microsoft.SourceLink.Gitea.csproj | 25 +++++++++------ .../build/Microsoft.SourceLink.Gitea.targets | 5 ++- .../Microsoft.SourceLink.Gitea.targets | 7 +++-- ...icrosoft.SourceLink.Gitee.UnitTests.csproj | 9 +++--- .../Microsoft.SourceLink.Gitee.csproj | 25 +++++++++------ .../build/Microsoft.SourceLink.Gitee.props | 7 +++-- .../build/Microsoft.SourceLink.Gitee.targets | 8 ++--- .../Microsoft.SourceLink.Gitee.props | 7 +++-- .../Microsoft.SourceLink.Gitee.targets | 7 +++-- ...icrosoft.SourceLink.Tools.UnitTests.csproj | 13 +++++--- .../Microsoft.SourceLink.Tools.Package.csproj | 16 ++++------ src/TestUtilities/TestUtilities.csproj | 16 +++++----- .../dotnet-sourcelink.csproj | 6 +++- .../runtimeconfig.template.json | 3 -- 78 files changed, 417 insertions(+), 359 deletions(-) delete mode 100644 eng/runtimeconfig.template.json delete mode 100644 src/dotnet-sourcelink/runtimeconfig.template.json diff --git a/eng/Publishing.props b/eng/Publishing.props index 797de4ea..bce33cb9 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -1,6 +1,7 @@ - - - 3 - + + + 3 + + \ No newline at end of file diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 0686223d..ffa36142 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -1,6 +1,4 @@ - - - + sourcelink @@ -8,11 +6,4 @@ true - - - $(InnerBuildArgs) /p:Pack=true - - - diff --git a/eng/Versions.props b/eng/Versions.props index 91748d5c..8e7fb54c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,25 +1,27 @@ - - + 8.0.0 beta true + 17.3.2 - 17.3.2 - - 17.5.0 - 19.210.0-preview + 17.3.2 + 5.7.0 - 5.7.0 + 2.0.0-beta4.22272.1 2.0.0-beta4.22272.1 0.4.0-alpha.22272.1 + 7.0.2 - 1.5.25 + + 19.210.0-preview 0.27.0-preview-0119 + 1.5.25 + diff --git a/eng/runtimeconfig.template.json b/eng/runtimeconfig.template.json deleted file mode 100644 index 384e2f49..00000000 --- a/eng/runtimeconfig.template.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "rollForwardOnNoCandidateFx": 2 -} diff --git a/global.json b/global.json index 61e0b333..26a09a63 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,7 @@ "dotnet": "8.0.100-preview.3.23178.7" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23217.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23217.1", + "Microsoft.Build.NoTargets": "3.7.0" } } diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 5283e917..f42a1687 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,4 @@ - - - + @@ -8,7 +6,6 @@ enable MIT true - $(RepositoryEngineeringDir)runtimeconfig.template.json true @@ -21,4 +18,5 @@ false + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index e12bc5d9..1a34fb80 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,8 +1,12 @@ - - - + + + + + $(NetCurrent) + + @@ -40,4 +44,5 @@ $(MSBuildProjectName) + diff --git a/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj b/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj index 469bde9c..e1bd5ed9 100644 --- a/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj +++ b/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj @@ -1,32 +1,21 @@ - - - - - net472;$(NetMinimum);$(NetCurrent) - true - true - true + - + + netstandard2.0 true - $(MSBuildProjectName).nuspec - $(OutputPath) - + true Standard CI targets. Standard CI msbuild targets true - false - false + + $(NoWarn);NU5128 + true - + - - - - - - diff --git a/src/Microsoft.Build.StandardCI/build/Microsoft.Build.StandardCI.props b/src/Microsoft.Build.StandardCI/build/Microsoft.Build.StandardCI.props index 69d79020..3c777fb7 100644 --- a/src/Microsoft.Build.StandardCI/build/Microsoft.Build.StandardCI.props +++ b/src/Microsoft.Build.StandardCI/build/Microsoft.Build.StandardCI.props @@ -1,6 +1,6 @@ - - + + $(STANDARD_CI_REPOSITORY_TYPE) + diff --git a/src/Microsoft.Build.Tasks.Git.UnitTests/Microsoft.Build.Tasks.Git.UnitTests.csproj b/src/Microsoft.Build.Tasks.Git.UnitTests/Microsoft.Build.Tasks.Git.UnitTests.csproj index 8fccc83a..187f29a8 100644 --- a/src/Microsoft.Build.Tasks.Git.UnitTests/Microsoft.Build.Tasks.Git.UnitTests.csproj +++ b/src/Microsoft.Build.Tasks.Git.UnitTests/Microsoft.Build.Tasks.Git.UnitTests.csproj @@ -1,10 +1,11 @@  - net472;$(NetCurrent) + $(NetCurrent);net472 + diff --git a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj index 5336efb1..d9634005 100644 --- a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj +++ b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -16,10 +14,12 @@ true true + - - + + + @@ -27,9 +27,11 @@ + + diff --git a/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props b/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props index c78c3134..b5885af9 100644 --- a/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props +++ b/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props @@ -1,8 +1,9 @@ - - + + $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Build.Tasks.Git.dll $(MSBuildThisFileDirectory)..\tools\core\Microsoft.Build.Tasks.Git.dll + diff --git a/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.targets b/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.targets index 825f665c..0ba42ac9 100644 --- a/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.targets +++ b/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.targets @@ -1,6 +1,6 @@ - - + + @@ -46,7 +46,6 @@ --> - - + - + + + diff --git a/src/Microsoft.Build.Tasks.Git/buildMultiTargeting/Microsoft.Build.Tasks.Git.targets b/src/Microsoft.Build.Tasks.Git/buildMultiTargeting/Microsoft.Build.Tasks.Git.targets index c72d0e0c..380fa6b2 100644 --- a/src/Microsoft.Build.Tasks.Git/buildMultiTargeting/Microsoft.Build.Tasks.Git.targets +++ b/src/Microsoft.Build.Tasks.Git/buildMultiTargeting/Microsoft.Build.Tasks.Git.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.csproj b/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.csproj index 5c2ac46a..68b8127c 100644 --- a/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.csproj +++ b/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.csproj @@ -1,10 +1,8 @@ - - - + + net472 true - true true @@ -17,14 +15,17 @@ true true + - - + + + + diff --git a/src/Microsoft.Build.Tasks.Tfvc/build/Microsoft.Build.Tasks.Tfvc.props b/src/Microsoft.Build.Tasks.Tfvc/build/Microsoft.Build.Tasks.Tfvc.props index 64301247..213d3ead 100644 --- a/src/Microsoft.Build.Tasks.Tfvc/build/Microsoft.Build.Tasks.Tfvc.props +++ b/src/Microsoft.Build.Tasks.Tfvc/build/Microsoft.Build.Tasks.Tfvc.props @@ -1,7 +1,8 @@ - - + + $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Build.Tasks.Tfvc.dll + diff --git a/src/Microsoft.Build.Tasks.Tfvc/build/Microsoft.Build.Tasks.Tfvc.targets b/src/Microsoft.Build.Tasks.Tfvc/build/Microsoft.Build.Tasks.Tfvc.targets index 0bc8d3ae..aab10c9b 100644 --- a/src/Microsoft.Build.Tasks.Tfvc/build/Microsoft.Build.Tasks.Tfvc.targets +++ b/src/Microsoft.Build.Tasks.Tfvc/build/Microsoft.Build.Tasks.Tfvc.targets @@ -1,6 +1,6 @@ - - + + @@ -41,7 +41,6 @@ --> - diff --git a/src/Microsoft.Build.Tasks.Tfvc/buildMultiTargeting/Microsoft.Build.Tasks.Tfvc.props b/src/Microsoft.Build.Tasks.Tfvc/buildMultiTargeting/Microsoft.Build.Tasks.Tfvc.props index afadd0e1..30db18f8 100644 --- a/src/Microsoft.Build.Tasks.Tfvc/buildMultiTargeting/Microsoft.Build.Tasks.Tfvc.props +++ b/src/Microsoft.Build.Tasks.Tfvc/buildMultiTargeting/Microsoft.Build.Tasks.Tfvc.props @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/Microsoft.Build.Tasks.Tfvc/buildMultiTargeting/Microsoft.Build.Tasks.Tfvc.targets b/src/Microsoft.Build.Tasks.Tfvc/buildMultiTargeting/Microsoft.Build.Tasks.Tfvc.targets index c72d0e0c..380fa6b2 100644 --- a/src/Microsoft.Build.Tasks.Tfvc/buildMultiTargeting/Microsoft.Build.Tasks.Tfvc.targets +++ b/src/Microsoft.Build.Tasks.Tfvc/buildMultiTargeting/Microsoft.Build.Tasks.Tfvc.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.AzureDevOpsServer.Git.UnitTests/Microsoft.SourceLink.AzureDevOpsServer.Git.UnitTests.csproj b/src/SourceLink.AzureDevOpsServer.Git.UnitTests/Microsoft.SourceLink.AzureDevOpsServer.Git.UnitTests.csproj index 360d5bd2..aa51e60a 100644 --- a/src/SourceLink.AzureDevOpsServer.Git.UnitTests/Microsoft.SourceLink.AzureDevOpsServer.Git.UnitTests.csproj +++ b/src/SourceLink.AzureDevOpsServer.Git.UnitTests/Microsoft.SourceLink.AzureDevOpsServer.Git.UnitTests.csproj @@ -1,11 +1,12 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + + diff --git a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj index 36758147..6ec405f0 100644 --- a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj +++ b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -15,6 +13,7 @@ MSBuild Tasks Azure DepOps Server TFS Git source link true + @@ -22,15 +21,20 @@ - - Microsoft.Build.Tasks.SourceControl - true - + + + + + - + + diff --git a/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets b/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets index 1425b43f..895b7c9b 100644 --- a/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets +++ b/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureDevOpsServer.Git.dll <_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureDevOpsServer.Git.dll @@ -53,7 +53,6 @@ We need to translate ssh URLs to https. --> - <_TranslatedSourceRoot Remove="@(_TranslatedSourceRoot)"/> @@ -68,5 +67,6 @@ + - + diff --git a/src/SourceLink.AzureDevOpsServer.Git/buildMultiTargeting/Microsoft.SourceLink.AzureDevOpsServer.Git.targets b/src/SourceLink.AzureDevOpsServer.Git/buildMultiTargeting/Microsoft.SourceLink.AzureDevOpsServer.Git.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.AzureDevOpsServer.Git/buildMultiTargeting/Microsoft.SourceLink.AzureDevOpsServer.Git.targets +++ b/src/SourceLink.AzureDevOpsServer.Git/buildMultiTargeting/Microsoft.SourceLink.AzureDevOpsServer.Git.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.AzureRepos.Git.UnitTests/Microsoft.SourceLink.AzureRepos.Git.UnitTests.csproj b/src/SourceLink.AzureRepos.Git.UnitTests/Microsoft.SourceLink.AzureRepos.Git.UnitTests.csproj index 9c60d030..a2bec23f 100644 --- a/src/SourceLink.AzureRepos.Git.UnitTests/Microsoft.SourceLink.AzureRepos.Git.UnitTests.csproj +++ b/src/SourceLink.AzureRepos.Git.UnitTests/Microsoft.SourceLink.AzureRepos.Git.UnitTests.csproj @@ -1,11 +1,12 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + + diff --git a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj index 827dbc30..f2fcb898 100644 --- a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj +++ b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -15,6 +13,7 @@ MSBuild Tasks Azure DevOps Repos VSTS Git source link true + @@ -22,15 +21,20 @@ - - Microsoft.Build.Tasks.SourceControl - true - + + + + + - + + diff --git a/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.props b/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.props index ca9cbc82..63bc00d3 100644 --- a/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.props +++ b/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.props @@ -1,9 +1,10 @@ - - + + + diff --git a/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets b/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets index c42ba6fe..bbbb0972 100644 --- a/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets +++ b/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureRepos.Git.dll <_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureRepos.Git.dll @@ -40,7 +40,6 @@ We need to translate ssh URLs to https. --> - <_TranslatedSourceRoot Remove="@(_TranslatedSourceRoot)"/> @@ -55,5 +54,6 @@ + diff --git a/src/SourceLink.AzureRepos.Git/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Git.props b/src/SourceLink.AzureRepos.Git/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Git.props index afadd0e1..30db18f8 100644 --- a/src/SourceLink.AzureRepos.Git/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Git.props +++ b/src/SourceLink.AzureRepos.Git/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Git.props @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.AzureRepos.Git/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Git.targets b/src/SourceLink.AzureRepos.Git/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Git.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.AzureRepos.Git/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Git.targets +++ b/src/SourceLink.AzureRepos.Git/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Git.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.csproj b/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.csproj index fddc9662..9b32d3d6 100644 --- a/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.csproj +++ b/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.csproj @@ -1,10 +1,8 @@ - - - + + net472 true - true true @@ -16,11 +14,13 @@ MSBuild Tasks Azure DevOps Repos VSTS TFVC source link true + + - - + + diff --git a/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets b/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets index c43523b5..7f42d202 100644 --- a/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets +++ b/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureRepos.Tfvc.dll <_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureRepos.Tfvc.dll diff --git a/src/SourceLink.AzureRepos.Tfvc/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Tfvc.targets b/src/SourceLink.AzureRepos.Tfvc/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Tfvc.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.AzureRepos.Tfvc/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Tfvc.targets +++ b/src/SourceLink.AzureRepos.Tfvc/buildMultiTargeting/Microsoft.SourceLink.AzureRepos.Tfvc.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.Bitbucket.Git.UnitTests/Microsoft.SourceLink.Bitbucket.Git.UnitTests.csproj b/src/SourceLink.Bitbucket.Git.UnitTests/Microsoft.SourceLink.Bitbucket.Git.UnitTests.csproj index a3c1e0d1..356665da 100644 --- a/src/SourceLink.Bitbucket.Git.UnitTests/Microsoft.SourceLink.Bitbucket.Git.UnitTests.csproj +++ b/src/SourceLink.Bitbucket.Git.UnitTests/Microsoft.SourceLink.Bitbucket.Git.UnitTests.csproj @@ -1,11 +1,12 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + + diff --git a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj index dc825042..49c4fe0b 100644 --- a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj +++ b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -15,21 +13,27 @@ MSBuild Tasks Bitbucket source link true + - - Microsoft.Build.Tasks.SourceControl - true - + + + + + - + + diff --git a/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.props b/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.props index 5c99acf2..77fa4e82 100644 --- a/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.props +++ b/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.props @@ -1,7 +1,8 @@ - - + + - + + diff --git a/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets b/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets index 968fcc63..286914e4 100644 --- a/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets +++ b/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Bitbucket.Git.dll <_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Bitbucket.Git.dll @@ -48,7 +48,6 @@ We need to translate ssh URLs to https. --> - <_TranslatedSourceRoot Remove="@(_TranslatedSourceRoot)"/> @@ -62,7 +61,6 @@ - - + diff --git a/src/SourceLink.Bitbucket.Git/buildMultiTargeting/Microsoft.SourceLink.Bitbucket.Git.props b/src/SourceLink.Bitbucket.Git/buildMultiTargeting/Microsoft.SourceLink.Bitbucket.Git.props index afadd0e1..30db18f8 100644 --- a/src/SourceLink.Bitbucket.Git/buildMultiTargeting/Microsoft.SourceLink.Bitbucket.Git.props +++ b/src/SourceLink.Bitbucket.Git/buildMultiTargeting/Microsoft.SourceLink.Bitbucket.Git.props @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.Bitbucket.Git/buildMultiTargeting/Microsoft.SourceLink.Bitbucket.Git.targets b/src/SourceLink.Bitbucket.Git/buildMultiTargeting/Microsoft.SourceLink.Bitbucket.Git.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.Bitbucket.Git/buildMultiTargeting/Microsoft.SourceLink.Bitbucket.Git.targets +++ b/src/SourceLink.Bitbucket.Git/buildMultiTargeting/Microsoft.SourceLink.Bitbucket.Git.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.Common.UnitTests/Microsoft.SourceLink.Common.UnitTests.csproj b/src/SourceLink.Common.UnitTests/Microsoft.SourceLink.Common.UnitTests.csproj index 9212f642..b37cc1d4 100644 --- a/src/SourceLink.Common.UnitTests/Microsoft.SourceLink.Common.UnitTests.csproj +++ b/src/SourceLink.Common.UnitTests/Microsoft.SourceLink.Common.UnitTests.csproj @@ -1,20 +1,26 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + - - Microsoft.Build.Tasks.SourceControl - true - + + + + + + + diff --git a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj index 7315d7f2..3b46d219 100644 --- a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj +++ b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -16,17 +14,20 @@ true true + - - + + + + diff --git a/src/SourceLink.Common/build/InitializeSourceControlInformation.targets b/src/SourceLink.Common/build/InitializeSourceControlInformation.targets index 81703fcb..2c56d855 100644 --- a/src/SourceLink.Common/build/InitializeSourceControlInformation.targets +++ b/src/SourceLink.Common/build/InitializeSourceControlInformation.targets @@ -1,6 +1,6 @@ - - + + @@ -41,4 +41,5 @@ + diff --git a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props index c78a26f4..b3e39598 100644 --- a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props +++ b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props @@ -1,6 +1,6 @@ - - + + <_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Common.dll <_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Common.dll @@ -17,5 +17,6 @@ Do not generate SourceLink when building in the IDE or for Live Unit Testing. --> true - + + diff --git a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets index 0f9a8613..2c7fb404 100644 --- a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets +++ b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.targets @@ -1,7 +1,7 @@ - - + - + + @@ -49,7 +49,6 @@ DependsOnTargets="_SetSourceLinkFilePath;$(_GenerateSourceLinkFileDependsOnTargets);_InitializeSourceRootMappedPathsOpt;$(SourceLinkUrlInitializerTargets)" Condition="'$(EnableSourceLink)' == 'true' and '$(DebugType)' != 'none'" Outputs="$(_SourceLinkFilePath)"> - - + diff --git a/src/SourceLink.Common/buildMultiTargeting/Microsoft.SourceLink.Common.props b/src/SourceLink.Common/buildMultiTargeting/Microsoft.SourceLink.Common.props index afadd0e1..30db18f8 100644 --- a/src/SourceLink.Common/buildMultiTargeting/Microsoft.SourceLink.Common.props +++ b/src/SourceLink.Common/buildMultiTargeting/Microsoft.SourceLink.Common.props @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.Common/buildMultiTargeting/Microsoft.SourceLink.Common.targets b/src/SourceLink.Common/buildMultiTargeting/Microsoft.SourceLink.Common.targets index 8e8e3be3..f5536ae0 100644 --- a/src/SourceLink.Common/buildMultiTargeting/Microsoft.SourceLink.Common.targets +++ b/src/SourceLink.Common/buildMultiTargeting/Microsoft.SourceLink.Common.targets @@ -1,7 +1,7 @@ - - + - + + - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + @@ -12,4 +12,5 @@ + diff --git a/src/SourceLink.GitHub.UnitTests/Microsoft.SourceLink.GitHub.UnitTests.csproj b/src/SourceLink.GitHub.UnitTests/Microsoft.SourceLink.GitHub.UnitTests.csproj index 358c18fc..33566fee 100644 --- a/src/SourceLink.GitHub.UnitTests/Microsoft.SourceLink.GitHub.UnitTests.csproj +++ b/src/SourceLink.GitHub.UnitTests/Microsoft.SourceLink.GitHub.UnitTests.csproj @@ -1,11 +1,12 @@ - - - + + net472;$(NetCurrent) + + diff --git a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj index 69356568..d57f5544 100644 --- a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj +++ b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -15,23 +13,30 @@ MSBuild Tasks GitHub source link true + - - Microsoft.Build.Tasks.SourceControl - true - + + + + + - + + + diff --git a/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.props b/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.props index 434ac4c7..8f6053c1 100644 --- a/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.props +++ b/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.props @@ -1,7 +1,8 @@ - - + + - + + diff --git a/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets b/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets index d41d3df9..724b6645 100644 --- a/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets +++ b/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkGitHubAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitHub.dll <_SourceLinkGitHubAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.GitHub.dll @@ -48,7 +48,6 @@ We need to translate ssh URLs to https. --> - <_TranslatedSourceRoot Remove="@(_TranslatedSourceRoot)"/> @@ -62,7 +61,6 @@ - - + diff --git a/src/SourceLink.GitHub/buildMultiTargeting/Microsoft.SourceLink.GitHub.props b/src/SourceLink.GitHub/buildMultiTargeting/Microsoft.SourceLink.GitHub.props index afadd0e1..30db18f8 100644 --- a/src/SourceLink.GitHub/buildMultiTargeting/Microsoft.SourceLink.GitHub.props +++ b/src/SourceLink.GitHub/buildMultiTargeting/Microsoft.SourceLink.GitHub.props @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.GitHub/buildMultiTargeting/Microsoft.SourceLink.GitHub.targets b/src/SourceLink.GitHub/buildMultiTargeting/Microsoft.SourceLink.GitHub.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.GitHub/buildMultiTargeting/Microsoft.SourceLink.GitHub.targets +++ b/src/SourceLink.GitHub/buildMultiTargeting/Microsoft.SourceLink.GitHub.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.GitLab.UnitTests/Microsoft.SourceLink.GitLab.UnitTests.csproj b/src/SourceLink.GitLab.UnitTests/Microsoft.SourceLink.GitLab.UnitTests.csproj index a3630258..b8224b6a 100644 --- a/src/SourceLink.GitLab.UnitTests/Microsoft.SourceLink.GitLab.UnitTests.csproj +++ b/src/SourceLink.GitLab.UnitTests/Microsoft.SourceLink.GitLab.UnitTests.csproj @@ -1,11 +1,12 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + + diff --git a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj index e9b487f2..ed2ae3ef 100644 --- a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj +++ b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -15,22 +13,29 @@ MSBuild Tasks GitLab source link true + - - Microsoft.Build.Tasks.SourceControl - true - + + + + + - + + + diff --git a/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.props b/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.props index 8484b2d1..f9326ed3 100644 --- a/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.props +++ b/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.props @@ -1,7 +1,8 @@ - - + + + diff --git a/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets b/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets index 0d427e8c..aa70c52a 100644 --- a/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets +++ b/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkGitLabAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitLab.dll <_SourceLinkGitLabAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.GitLab.dll diff --git a/src/SourceLink.GitLab/buildMultiTargeting/Microsoft.SourceLink.GitLab.props b/src/SourceLink.GitLab/buildMultiTargeting/Microsoft.SourceLink.GitLab.props index afadd0e1..30db18f8 100644 --- a/src/SourceLink.GitLab/buildMultiTargeting/Microsoft.SourceLink.GitLab.props +++ b/src/SourceLink.GitLab/buildMultiTargeting/Microsoft.SourceLink.GitLab.props @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.GitLab/buildMultiTargeting/Microsoft.SourceLink.GitLab.targets b/src/SourceLink.GitLab/buildMultiTargeting/Microsoft.SourceLink.GitLab.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.GitLab/buildMultiTargeting/Microsoft.SourceLink.GitLab.targets +++ b/src/SourceLink.GitLab/buildMultiTargeting/Microsoft.SourceLink.GitLab.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.GitWeb.UnitTests/Microsoft.SourceLink.GitWeb.UnitTests.csproj b/src/SourceLink.GitWeb.UnitTests/Microsoft.SourceLink.GitWeb.UnitTests.csproj index 47d0f5fc..9d8bcf19 100644 --- a/src/SourceLink.GitWeb.UnitTests/Microsoft.SourceLink.GitWeb.UnitTests.csproj +++ b/src/SourceLink.GitWeb.UnitTests/Microsoft.SourceLink.GitWeb.UnitTests.csproj @@ -1,11 +1,12 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + + diff --git a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj index 37e23f35..b3a7f583 100644 --- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj +++ b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -15,24 +13,30 @@ MSBuild Tasks GitWeb source link true + - - Microsoft.Build.Tasks.SourceControl - true - - + + + + + - + + + diff --git a/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets b/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets index 2885c15e..9c029389 100644 --- a/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets +++ b/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkGitWebAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitWeb.dll <_SourceLinkGitWebAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.GitWeb.dll @@ -63,4 +63,5 @@ + diff --git a/src/SourceLink.GitWeb/buildMultiTargeting/Microsoft.SourceLink.GitWeb.targets b/src/SourceLink.GitWeb/buildMultiTargeting/Microsoft.SourceLink.GitWeb.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.GitWeb/buildMultiTargeting/Microsoft.SourceLink.GitWeb.targets +++ b/src/SourceLink.GitWeb/buildMultiTargeting/Microsoft.SourceLink.GitWeb.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.Gitea.UnitTests/Microsoft.SourceLink.Gitea.UnitTests.csproj b/src/SourceLink.Gitea.UnitTests/Microsoft.SourceLink.Gitea.UnitTests.csproj index 504a7378..337250e0 100644 --- a/src/SourceLink.Gitea.UnitTests/Microsoft.SourceLink.Gitea.UnitTests.csproj +++ b/src/SourceLink.Gitea.UnitTests/Microsoft.SourceLink.Gitea.UnitTests.csproj @@ -1,11 +1,12 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + + diff --git a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj index 8c4dcea4..4f9297c4 100644 --- a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj +++ b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -15,22 +13,29 @@ MSBuild Tasks Gitea source link true + - - Microsoft.Build.Tasks.SourceControl - true - + + + + + - + + + diff --git a/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets b/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets index 1ed82b01..2ad245d8 100644 --- a/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets +++ b/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkGiteaAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Gitea.dll <_SourceLinkGiteaAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Gitea.dll @@ -48,7 +48,6 @@ We need to translate ssh URLs to https. --> - <_TranslatedSourceRoot Remove="@(_TranslatedSourceRoot)"/> diff --git a/src/SourceLink.Gitea/buildMultiTargeting/Microsoft.SourceLink.Gitea.targets b/src/SourceLink.Gitea/buildMultiTargeting/Microsoft.SourceLink.Gitea.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.Gitea/buildMultiTargeting/Microsoft.SourceLink.Gitea.targets +++ b/src/SourceLink.Gitea/buildMultiTargeting/Microsoft.SourceLink.Gitea.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.Gitee.UnitTests/Microsoft.SourceLink.Gitee.UnitTests.csproj b/src/SourceLink.Gitee.UnitTests/Microsoft.SourceLink.Gitee.UnitTests.csproj index 7384e9d9..eca7c81f 100644 --- a/src/SourceLink.Gitee.UnitTests/Microsoft.SourceLink.Gitee.UnitTests.csproj +++ b/src/SourceLink.Gitee.UnitTests/Microsoft.SourceLink.Gitee.UnitTests.csproj @@ -1,11 +1,12 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 + + diff --git a/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj b/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj index 86a98b2a..4aa1fc80 100644 --- a/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj +++ b/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj @@ -1,9 +1,7 @@ - - - + + - net472;$(NetMinimum);$(NetCurrent) - $(NetCurrent) + $(NetCurrent);$(NetMinimum);net472 true @@ -15,23 +13,30 @@ MSBuild Tasks Gitee source link true + - - Microsoft.Build.Tasks.SourceControl - true - + + + + + - + + + diff --git a/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.props b/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.props index 26681d81..230a1a56 100644 --- a/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.props +++ b/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.props @@ -1,7 +1,8 @@ - - + + - + + diff --git a/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.targets b/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.targets index 42b33f9a..2e2b5dd7 100644 --- a/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.targets +++ b/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.targets @@ -1,6 +1,6 @@ - - + + <_SourceLinkGiteeAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Gitee.dll <_SourceLinkGiteeAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Gitee.dll @@ -48,7 +48,6 @@ We need to translate ssh URLs to https. --> - <_TranslatedSourceRoot Remove="@(_TranslatedSourceRoot)"/> @@ -62,7 +61,6 @@ - - + diff --git a/src/SourceLink.Gitee/buildMultiTargeting/Microsoft.SourceLink.Gitee.props b/src/SourceLink.Gitee/buildMultiTargeting/Microsoft.SourceLink.Gitee.props index afadd0e1..30db18f8 100644 --- a/src/SourceLink.Gitee/buildMultiTargeting/Microsoft.SourceLink.Gitee.props +++ b/src/SourceLink.Gitee/buildMultiTargeting/Microsoft.SourceLink.Gitee.props @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.Gitee/buildMultiTargeting/Microsoft.SourceLink.Gitee.targets b/src/SourceLink.Gitee/buildMultiTargeting/Microsoft.SourceLink.Gitee.targets index c72d0e0c..380fa6b2 100644 --- a/src/SourceLink.Gitee/buildMultiTargeting/Microsoft.SourceLink.Gitee.targets +++ b/src/SourceLink.Gitee/buildMultiTargeting/Microsoft.SourceLink.Gitee.targets @@ -1,5 +1,6 @@ - - + - + + + diff --git a/src/SourceLink.Tools.UnitTests/Microsoft.SourceLink.Tools.UnitTests.csproj b/src/SourceLink.Tools.UnitTests/Microsoft.SourceLink.Tools.UnitTests.csproj index 25f8c623..8f4b5abe 100644 --- a/src/SourceLink.Tools.UnitTests/Microsoft.SourceLink.Tools.UnitTests.csproj +++ b/src/SourceLink.Tools.UnitTests/Microsoft.SourceLink.Tools.UnitTests.csproj @@ -1,14 +1,17 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 - + + + + + diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj index 096b4ee8..6bff72af 100644 --- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj +++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj @@ -1,24 +1,20 @@ - - - + + $(NetCurrent);netstandard2.0 - false - none - false true true Microsoft.SourceLink.Tools false - - Package containing sources of tools for reading Source Link. - + Package containing sources of tools for reading Source Link. $(NoWarn);NU5128 - + + + diff --git a/src/TestUtilities/TestUtilities.csproj b/src/TestUtilities/TestUtilities.csproj index ff309789..e8433aaa 100644 --- a/src/TestUtilities/TestUtilities.csproj +++ b/src/TestUtilities/TestUtilities.csproj @@ -1,22 +1,19 @@ - - - + + - net472;$(NetCurrent) + $(NetCurrent);net472 false true false - - - + - + - + @@ -41,4 +38,5 @@ + diff --git a/src/dotnet-sourcelink/dotnet-sourcelink.csproj b/src/dotnet-sourcelink/dotnet-sourcelink.csproj index 7d150b07..66d23039 100644 --- a/src/dotnet-sourcelink/dotnet-sourcelink.csproj +++ b/src/dotnet-sourcelink/dotnet-sourcelink.csproj @@ -1,7 +1,10 @@  + - Exe $(NetCurrent) + Exe + + Major true @@ -19,4 +22,5 @@ + diff --git a/src/dotnet-sourcelink/runtimeconfig.template.json b/src/dotnet-sourcelink/runtimeconfig.template.json deleted file mode 100644 index 2c73f398..00000000 --- a/src/dotnet-sourcelink/runtimeconfig.template.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "rollForwardOnNoCandidateFx": 2 -} \ No newline at end of file