diff --git a/README.md b/README.md index ab581e87..a550bdf7 100644 --- a/README.md +++ b/README.md @@ -182,9 +182,9 @@ The only feature currently supported is mapping of source files to the source re ## Prerequisites for .NET projects -Source Link supports classic .NET Framework projects as well as .NET SDK projects, that is projects that import `Microsoft.NET.Sdk` (e.g. like so: ``). The project may target any .NET Framework or .NET Core App/Standard version. All PDB formats are supported: Portable, Embedded and Windows PDBs. +Source Link supports classic .NET Framework projects as well as .NET SDK projects, that is projects that import `Microsoft.NET.Sdk` (e.g. like so: ``). The project may target .NET, .NET Framework or .NET Standard. All PDB formats are supported: Portable, Embedded and Windows PDBs. -[.NET Core SDK 2.1.300](https://www.microsoft.com/net/download/dotnet-core/sdk-2.1.300) or newer is required for .NET SDK projects. If building via desktop `msbuild` you'll need version 15.7 or higher. +[.NET 8 SDK](https://www.microsoft.com/net/download/dotnet/8.0) or newer is required for .NET SDK projects. If building via desktop `msbuild` you'll need version 16.0 or higher. The following features are not available in projects that do not import `Microsoft.NET.Sdk`: - Automatic inclusion of commit SHA in `AssemblyInformationalVersionAttribute`. @@ -200,8 +200,6 @@ The VC++ linker supports `/SOURCELINK` [switch](https://docs.microsoft.com/en-us ## Known issues -- `EmbedUntrackedSources` does not work in Visual Basic projects that use .NET SDK: https://github.com/dotnet/sourcelink/issues/193 (fixed in Visual Studio 2019) -- Issue when building WPF projects with `/p:ContinuousIntegrationBuild=true`: https://github.com/dotnet/sourcelink/issues/91 - Issue when building WPF projects with embedding sources on and `BaseIntermediateOutputPath` not a subdirectory of the project directory: https://github.com/dotnet/sourcelink/issues/492 ## PDB distributions @@ -222,7 +220,7 @@ Keep in mind that including PDBs in the .nupkg increases the size of the package - They do not support Windows PDBs (generated by VC++, or for managed projects that set build property `DebugType` to `full`) - They require the library to be built by newer C#/VB compiler (Visual Studio 2017 Update 9). -- The consumer of the package also needs Visual Studio 2017 Update 9 debugger. +- The consumer of the package also needs Visual Studio 2017 Update 9 or newer. - Not supported by [Azure DevOps Artifacts](https://azure.microsoft.com/en-us/services/devops/artifacts) service. Consider including PDBs in the main package if it is not possible to use .snupkg for the above reasons. @@ -230,12 +228,12 @@ For managed projects, consider switching to Portable PDBs by setting `DebugType` ## Builds -Pre-release builds are available from Azure DevOps public feed: `https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json` ([browse](https://dev.azure.com/dnceng/public/_packaging?_a=feed&feed=dotnet8)). +Pre-release builds are available from Azure DevOps public feed: `https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json` ([browse](https://dev.azure.com/dnceng/public/_packaging?_a=feed&feed=dotnet9)). [![Build Status](https://dnceng.visualstudio.com/public/_apis/build/status/SourceLink%20PR?branchName=main)](https://dnceng.visualstudio.com/public/_build/latest?definitionId=297?branchName=main) ## Experience in Visual Studio -The following screenshot demonstrates debugging a NuGet package referenced by an application, with source automatically downloaded from GitHub and used by Visual Studio 2017. +The following screenshot demonstrates debugging a NuGet package referenced by an application, with source automatically downloaded from GitHub and used by Visual Studio. ![sourcelink-example](https://user-images.githubusercontent.com/2608468/39667937-10d7dabe-5076-11e8-815e-935724b3a783.PNG) diff --git a/eng/BuildTask.targets b/eng/BuildTask.targets new file mode 100644 index 00000000..c4a99a0c --- /dev/null +++ b/eng/BuildTask.targets @@ -0,0 +1,112 @@ + + + + + false + true + + true + true + $(TargetsForTfmSpecificContentInPackage);_AddBuildOutputToPackageCore;_AddBuildOutputToPackageDesktop + true + + $(NoWarn);NU5128 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + all + runtime + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 4407f802..41ecf24b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,4 +1,5 @@ + @@ -9,11 +10,5 @@ true - - - - false - + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 5a064d1e..066d72a1 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,25 +1,7 @@ - - - - $(NetCurrent) - - - - - - - - - - - <_ProjectDefinedPackageId>$(PackageId) - *fake_packageid_for_project_$(MSBuildProjectName)* - + - - - $(_ProjectDefinedPackageId) - $(AssemblyName) - $(MSBuildProjectName) - - - diff --git a/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj b/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj index ac6685ac..97453163 100644 --- a/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj +++ b/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj @@ -2,20 +2,11 @@ netstandard2.0 - true true Standard CI targets. Standard CI msbuild targets - true - - $(NoWarn);NU5128 - true + true + false - - - - \ No newline at end of file diff --git a/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.nuspec b/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.nuspec deleted file mode 100644 index 53cef9c9..00000000 --- a/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.nuspec +++ /dev/null @@ -1,10 +0,0 @@ - - - - $CommonMetadataElements$ - - - $CommonFileElements$ - - - \ No newline at end of file diff --git a/src/Microsoft.Build.StandardCI/buildTransitive/Microsoft.Build.StandardCI.props b/src/Microsoft.Build.StandardCI/buildTransitive/Microsoft.Build.StandardCI.props new file mode 100644 index 00000000..bdcdcbe9 --- /dev/null +++ b/src/Microsoft.Build.StandardCI/buildTransitive/Microsoft.Build.StandardCI.props @@ -0,0 +1,4 @@ + + + + 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..64eaec35 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,7 +1,7 @@  - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) 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 d08cacf1..c6176c5f 100644 --- a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj +++ b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj @@ -1,17 +1,10 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) MSBuild tasks providing git repository information. MSBuild Tasks source control git - true - true + true @@ -25,4 +18,5 @@ + diff --git a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.nuspec b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.nuspec deleted file mode 100644 index d66e997a..00000000 --- a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.nuspec +++ /dev/null @@ -1,15 +0,0 @@ - - - - $CommonMetadataElements$ - - - $CommonFileElements$ - - - - - - - - \ No newline at end of file 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 0f278a0b..ab81011f 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,7 +1,7 @@  - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Build.Tasks.Git.dll - $(MSBuildThisFileDirectory)..\tools\core\Microsoft.Build.Tasks.Git.dll + $(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.Build.Tasks.Git.dll + $(MSBuildThisFileDirectory)..\tools\net\Microsoft.Build.Tasks.Git.dll diff --git a/src/Microsoft.Build.Tasks.Git/buildTransitive/Microsoft.Build.Tasks.Git.props b/src/Microsoft.Build.Tasks.Git/buildTransitive/Microsoft.Build.Tasks.Git.props new file mode 100644 index 00000000..bdcdcbe9 --- /dev/null +++ b/src/Microsoft.Build.Tasks.Git/buildTransitive/Microsoft.Build.Tasks.Git.props @@ -0,0 +1,4 @@ + + + + diff --git a/src/Microsoft.Build.Tasks.Git/buildTransitive/Microsoft.Build.Tasks.Git.targets b/src/Microsoft.Build.Tasks.Git/buildTransitive/Microsoft.Build.Tasks.Git.targets new file mode 100644 index 00000000..77e46e1b --- /dev/null +++ b/src/Microsoft.Build.Tasks.Git/buildTransitive/Microsoft.Build.Tasks.Git.targets @@ -0,0 +1,4 @@ + + + + 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 9bae7ca0..1c9cced0 100644 --- a/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.csproj +++ b/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.csproj @@ -1,18 +1,11 @@ + - net472 - true + $(NetFrameworkToolCurrent) true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) - MSBuild tasks providing TFVC repository information. MSBuild Tasks TFVC source link - true - true + true @@ -22,4 +15,5 @@ + diff --git a/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.nuspec b/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.nuspec deleted file mode 100644 index 05353b3f..00000000 --- a/src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - $CommonMetadataElements$ - - - $CommonFileElements$ - - - - - - - - - - - - - - \ No newline at end of file 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 863a3a53..31744df8 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,6 +1,6 @@  - $(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Build.Tasks.Tfvc.dll + $(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.Build.Tasks.Tfvc.dll diff --git a/src/Microsoft.Build.Tasks.Tfvc/buildTransitive/Microsoft.Build.Tasks.Tfvc.props b/src/Microsoft.Build.Tasks.Tfvc/buildTransitive/Microsoft.Build.Tasks.Tfvc.props new file mode 100644 index 00000000..bdcdcbe9 --- /dev/null +++ b/src/Microsoft.Build.Tasks.Tfvc/buildTransitive/Microsoft.Build.Tasks.Tfvc.props @@ -0,0 +1,4 @@ + + + + diff --git a/src/Microsoft.Build.Tasks.Tfvc/buildTransitive/Microsoft.Build.Tasks.Tfvc.targets b/src/Microsoft.Build.Tasks.Tfvc/buildTransitive/Microsoft.Build.Tasks.Tfvc.targets new file mode 100644 index 00000000..77e46e1b --- /dev/null +++ b/src/Microsoft.Build.Tasks.Tfvc/buildTransitive/Microsoft.Build.Tasks.Tfvc.targets @@ -0,0 +1,4 @@ + + + + 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 6930393c..b291969d 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,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj index 5d6c260f..ca3eebae 100644 --- a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj +++ b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj @@ -1,19 +1,21 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) Generates source link for Azure DevOps Server (formerly known as TFS) Git repositories. MSBuild Tasks Azure DepOps Server TFS Git source link - true + true + + + + + + + + diff --git a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.nuspec b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.nuspec deleted file mode 100644 index 4d680825..00000000 --- a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - - - \ No newline at end of file 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 ec372220..76a2e923 100644 --- a/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets +++ b/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets @@ -1,8 +1,8 @@  - <_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureDevOpsServer.Git.dll - <_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureDevOpsServer.Git.dll + <_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.AzureDevOpsServer.Git.dll + <_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.AzureDevOpsServer.Git.dll 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 3c45f19f..ee716e3f 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,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj index 7e68aacb..aee8ef89 100644 --- a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj +++ b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj @@ -1,19 +1,21 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) Generates source link for Azure Repos (formerly known as VSTS) Git repositories. MSBuild Tasks Azure DevOps Repos VSTS Git source link - true + true + + + + + + + + diff --git a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.nuspec b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.nuspec deleted file mode 100644 index daebdb38..00000000 --- a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - - - \ No newline at end of file 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 1ba9cb80..91f9bf53 100644 --- a/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets +++ b/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets @@ -1,8 +1,8 @@  - <_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureRepos.Git.dll - <_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureRepos.Git.dll + <_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.AzureRepos.Git.dll + <_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.AzureRepos.Git.dll diff --git a/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.csproj b/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.csproj index 540001cf..7099c61a 100644 --- a/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.csproj +++ b/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.csproj @@ -1,23 +1,22 @@ + - net472 - true + $(NetFrameworkToolCurrent) true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) - Generates source link for Azure Repos (formerly known as VSTS) TFVC repositories. MSBuild Tasks Azure DevOps Repos VSTS TFVC source link - true + true + + + + + diff --git a/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.nuspec b/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.nuspec deleted file mode 100644 index b2f393cb..00000000 --- a/src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - \ No newline at end of file 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 488e858b..ee740fba 100644 --- a/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets +++ b/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets @@ -1,8 +1,7 @@  - <_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureRepos.Tfvc.dll - <_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureRepos.Tfvc.dll + <_SourceLinkAzureReposTfvcAssemblyFile>$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.AzureRepos.Tfvc.dll 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 37bfa6fa..99235780 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,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj index 990fc770..47eb6288 100644 --- a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj +++ b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj @@ -1,20 +1,22 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) Generates source link for Bitbucket repositories. MSBuild Tasks Bitbucket source link - true + true + + + + + + + + diff --git a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.nuspec b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.nuspec deleted file mode 100644 index bc900a19..00000000 --- a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - - - \ No newline at end of file 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 30791dfa..a3165f08 100644 --- a/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets +++ b/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets @@ -1,8 +1,8 @@  - <_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Bitbucket.Git.dll - <_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Bitbucket.Git.dll + <_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.Bitbucket.Git.dll + <_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.Bitbucket.Git.dll diff --git a/src/SourceLink.Common.UnitTests/Microsoft.SourceLink.Common.UnitTests.csproj b/src/SourceLink.Common.UnitTests/Microsoft.SourceLink.Common.UnitTests.csproj index 9cfd728c..14350cc4 100644 --- a/src/SourceLink.Common.UnitTests/Microsoft.SourceLink.Common.UnitTests.csproj +++ b/src/SourceLink.Common.UnitTests/Microsoft.SourceLink.Common.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj index 2b6537c4..bce42f06 100644 --- a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj +++ b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj @@ -1,17 +1,10 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) MSBuild tasks providing source control information. MSBuild Tasks source control - true - true + true @@ -24,4 +17,5 @@ + diff --git a/src/SourceLink.Common/Microsoft.SourceLink.Common.nuspec b/src/SourceLink.Common/Microsoft.SourceLink.Common.nuspec deleted file mode 100644 index 85963bb2..00000000 --- a/src/SourceLink.Common/Microsoft.SourceLink.Common.nuspec +++ /dev/null @@ -1,14 +0,0 @@ - - - - $CommonMetadataElements$ - - - $CommonFileElements$ - - - - - - - \ No newline at end of file diff --git a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props index 2b84e683..c5703a59 100644 --- a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props +++ b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props @@ -1,10 +1,9 @@  - <_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Common.dll - <_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Common.dll + <_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.Common.dll + <_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.Common.dll - + + + diff --git a/src/SourceLink.Common/buildTransitive/Microsoft.SourceLink.Common.targets b/src/SourceLink.Common/buildTransitive/Microsoft.SourceLink.Common.targets new file mode 100644 index 00000000..77e46e1b --- /dev/null +++ b/src/SourceLink.Common/buildTransitive/Microsoft.SourceLink.Common.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/SourceLink.Git.IntegrationTests/Microsoft.SourceLink.Git.IntegrationTests.csproj b/src/SourceLink.Git.IntegrationTests/Microsoft.SourceLink.Git.IntegrationTests.csproj index ee2982b8..8a4acbdb 100644 --- a/src/SourceLink.Git.IntegrationTests/Microsoft.SourceLink.Git.IntegrationTests.csproj +++ b/src/SourceLink.Git.IntegrationTests/Microsoft.SourceLink.Git.IntegrationTests.csproj @@ -1,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.GitHub.UnitTests/Microsoft.SourceLink.GitHub.UnitTests.csproj b/src/SourceLink.GitHub.UnitTests/Microsoft.SourceLink.GitHub.UnitTests.csproj index 5ffb5b92..02b7a11d 100644 --- a/src/SourceLink.GitHub.UnitTests/Microsoft.SourceLink.GitHub.UnitTests.csproj +++ b/src/SourceLink.GitHub.UnitTests/Microsoft.SourceLink.GitHub.UnitTests.csproj @@ -1,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj index 0948b1df..545d37a4 100644 --- a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj +++ b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj @@ -1,20 +1,22 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) Generates source link for GitHub repositories. MSBuild Tasks GitHub source link - true + true + + + + + + + + diff --git a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.nuspec b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.nuspec deleted file mode 100644 index ed8fe9f3..00000000 --- a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - - - \ No newline at end of file diff --git a/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets b/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets index 231a4ea5..67f8d2e9 100644 --- a/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets +++ b/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets @@ -1,8 +1,8 @@  - <_SourceLinkGitHubAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitHub.dll - <_SourceLinkGitHubAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.GitHub.dll + <_SourceLinkGitHubAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.GitHub.dll + <_SourceLinkGitHubAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.GitHub.dll diff --git a/src/SourceLink.GitLab.UnitTests/Microsoft.SourceLink.GitLab.UnitTests.csproj b/src/SourceLink.GitLab.UnitTests/Microsoft.SourceLink.GitLab.UnitTests.csproj index d939220e..0dfd6337 100644 --- a/src/SourceLink.GitLab.UnitTests/Microsoft.SourceLink.GitLab.UnitTests.csproj +++ b/src/SourceLink.GitLab.UnitTests/Microsoft.SourceLink.GitLab.UnitTests.csproj @@ -1,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj index b7ea016c..5f686b7b 100644 --- a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj +++ b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj @@ -1,19 +1,21 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) Generates source link for GitLab repositories. MSBuild Tasks GitLab source link - true + true + + + + + + + + diff --git a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.nuspec b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.nuspec deleted file mode 100644 index 27e937f2..00000000 --- a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - - - \ No newline at end of file diff --git a/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets b/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets index ecf48155..27b4c4ba 100644 --- a/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets +++ b/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets @@ -1,8 +1,8 @@  - <_SourceLinkGitLabAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitLab.dll - <_SourceLinkGitLabAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.GitLab.dll + <_SourceLinkGitLabAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.GitLab.dll + <_SourceLinkGitLabAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.GitLab.dll diff --git a/src/SourceLink.GitWeb.UnitTests/Microsoft.SourceLink.GitWeb.UnitTests.csproj b/src/SourceLink.GitWeb.UnitTests/Microsoft.SourceLink.GitWeb.UnitTests.csproj index 06e7b03b..bb38e214 100644 --- a/src/SourceLink.GitWeb.UnitTests/Microsoft.SourceLink.GitWeb.UnitTests.csproj +++ b/src/SourceLink.GitWeb.UnitTests/Microsoft.SourceLink.GitWeb.UnitTests.csproj @@ -1,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj index e2dfe374..764e9ae3 100644 --- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj +++ b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj @@ -1,20 +1,22 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) Generates source link for Git repositories using a GitWeb server. MSBuild Tasks GitWeb source link - true + true + + + + + + + + diff --git a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.nuspec b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.nuspec deleted file mode 100644 index 265f8361..00000000 --- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - - - diff --git a/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets b/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets index 13f8d211..0babe916 100644 --- a/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets +++ b/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets @@ -1,8 +1,8 @@  - <_SourceLinkGitWebAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitWeb.dll - <_SourceLinkGitWebAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.GitWeb.dll + <_SourceLinkGitWebAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.GitWeb.dll + <_SourceLinkGitWebAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.GitWeb.dll diff --git a/src/SourceLink.Gitea.UnitTests/Microsoft.SourceLink.Gitea.UnitTests.csproj b/src/SourceLink.Gitea.UnitTests/Microsoft.SourceLink.Gitea.UnitTests.csproj index 3b53bf33..a53bd2b1 100644 --- a/src/SourceLink.Gitea.UnitTests/Microsoft.SourceLink.Gitea.UnitTests.csproj +++ b/src/SourceLink.Gitea.UnitTests/Microsoft.SourceLink.Gitea.UnitTests.csproj @@ -1,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj index 44c70588..1ad6400c 100644 --- a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj +++ b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj @@ -1,19 +1,21 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) Generates source link for Gitea repositories. MSBuild Tasks Gitea source link - true + true + + + + + + + + diff --git a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.nuspec b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.nuspec deleted file mode 100644 index 2019d3ca..00000000 --- a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - - - \ No newline at end of file diff --git a/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets b/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets index dd71dd04..850b5c46 100644 --- a/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets +++ b/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets @@ -1,8 +1,8 @@  - <_SourceLinkGiteaAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Gitea.dll - <_SourceLinkGiteaAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Gitea.dll + <_SourceLinkGiteaAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.Gitea.dll + <_SourceLinkGiteaAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.Gitea.dll diff --git a/src/SourceLink.Gitee.UnitTests/Microsoft.SourceLink.Gitee.UnitTests.csproj b/src/SourceLink.Gitee.UnitTests/Microsoft.SourceLink.Gitee.UnitTests.csproj index 56fd1b43..77b36252 100644 --- a/src/SourceLink.Gitee.UnitTests/Microsoft.SourceLink.Gitee.UnitTests.csproj +++ b/src/SourceLink.Gitee.UnitTests/Microsoft.SourceLink.Gitee.UnitTests.csproj @@ -1,6 +1,6 @@ - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj b/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj index 38ae8d22..0354586b 100644 --- a/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj +++ b/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.csproj @@ -1,20 +1,22 @@ - - net472;$(NetMinimum);$(NetCurrent) - true - - - true - $(MSBuildProjectName).nuspec - $(OutputPath) + + $(NetToolMinimum);$(NetFrameworkToolCurrent) Generates source link for Gitee repositories. MSBuild Tasks Gitee source link - true + true + + + + + + + + diff --git a/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.nuspec b/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.nuspec deleted file mode 100644 index ea8040bf..00000000 --- a/src/SourceLink.Gitee/Microsoft.SourceLink.Gitee.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $CommonMetadataElements$ - - - - - - - $CommonFileElements$ - - - - - - - \ No newline at end of file diff --git a/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.targets b/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.targets index f5b331ce..769a1090 100644 --- a/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.targets +++ b/src/SourceLink.Gitee/build/Microsoft.SourceLink.Gitee.targets @@ -1,8 +1,8 @@  - <_SourceLinkGiteeAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Gitee.dll - <_SourceLinkGiteeAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Gitee.dll + <_SourceLinkGiteeAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\netframework\Microsoft.SourceLink.Gitee.dll + <_SourceLinkGiteeAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net\Microsoft.SourceLink.Gitee.dll diff --git a/src/SourceLink.Tools.UnitTests/Microsoft.SourceLink.Tools.UnitTests.csproj b/src/SourceLink.Tools.UnitTests/Microsoft.SourceLink.Tools.UnitTests.csproj index 1674afba..d3ff5f62 100644 --- a/src/SourceLink.Tools.UnitTests/Microsoft.SourceLink.Tools.UnitTests.csproj +++ b/src/SourceLink.Tools.UnitTests/Microsoft.SourceLink.Tools.UnitTests.csproj @@ -1,6 +1,6 @@  - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj index 484a7783..534c5611 100644 --- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj +++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj @@ -1,19 +1,15 @@ - $(NetCurrent);netstandard2.0 + $(NetToolMinimum);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/DotNetSdk/DotNetSdkTestBase.cs b/src/TestUtilities/DotNetSdk/DotNetSdkTestBase.cs index d57a284a..5c23fbe8 100644 --- a/src/TestUtilities/DotNetSdk/DotNetSdkTestBase.cs +++ b/src/TestUtilities/DotNetSdk/DotNetSdkTestBase.cs @@ -110,7 +110,7 @@ static bool isDotNetInstallDirectory(string? dir) } } - public void Dispose() + public void Dispose() => Temp.Dispose(); private const string EmptyValueMarker = "--{empty}--"; @@ -218,12 +218,12 @@ public static string EnsureTrailingDirectorySeparator(string path) => (path.LastOrDefault() == Path.DirectorySeparatorChar) ? path : path + Path.DirectorySeparatorChar; protected void VerifyValues( - string customProps, + string customProps, string customTargets, string[] targets, - string[] expressions, - string[]? expectedResults = null, - string[]? expectedErrors = null, + string[] expressions, + string[]? expectedResults = null, + string[]? expectedErrors = null, string[]? expectedWarnings = null, string? additionalCommandLineArgs = null, string buildVerbosity = "minimal", @@ -281,7 +281,7 @@ static bool diagnosticsEqual(string expected, string actual) } var outputLines = buildResult.Output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); - + if (expectedErrors == null) { Assert.True(buildResult.ExitCode == 0, $"Build failed with exit code {buildResult.ExitCode}:{Environment.NewLine}{buildResult.Output}{Environment.NewLine}{buildResult.Errors}"); @@ -326,4 +326,4 @@ private void FixupGeneratedPropsFilePath(string generatedPropsFilePath) File.WriteAllText(generatedPropsFilePath, content, Encoding.UTF8); } } -} +} \ No newline at end of file diff --git a/src/TestUtilities/TestUtilities.csproj b/src/TestUtilities/TestUtilities.csproj index 4657489a..69a95ee0 100644 --- a/src/TestUtilities/TestUtilities.csproj +++ b/src/TestUtilities/TestUtilities.csproj @@ -1,13 +1,14 @@  - net472;$(NetCurrent) + $(NetToolCurrent);$(NetFrameworkToolCurrent) true false + diff --git a/src/dotnet-sourcelink/dotnet-sourcelink.csproj b/src/dotnet-sourcelink/dotnet-sourcelink.csproj index 94856ada..49762971 100644 --- a/src/dotnet-sourcelink/dotnet-sourcelink.csproj +++ b/src/dotnet-sourcelink/dotnet-sourcelink.csproj @@ -1,7 +1,7 @@  Exe - $(NetCurrent) + $(NetToolMinimum) Major