Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Target netcoreapp3.1 #767

Merged
merged 3 commits into from Nov 10, 2021
Merged

Target netcoreapp3.1 #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6afb7c
Target netcoreapp3.1
tmat Nov 9, 2021
eb5c125
1.1.1
tmat Nov 9, 2021
aa29a63
Fix
tmat Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 0 additions & 21 deletions eng/BuildTask.targets
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<Project>
<PropertyGroup>
<!-- This repo version -->
<VersionPrefix>1.1.0</VersionPrefix>
<VersionPrefix>1.1.1</VersionPrefix>
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
<SemanticVersioningV1>true</SemanticVersioningV1>
<!-- Opt-in repo features -->
Expand Down
6 changes: 6 additions & 0 deletions src/Directory.Build.targets
View file
Open in desktop
Expand Up @@ -3,6 +3,12 @@
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<ItemGroup>
<NuspecProperty Include="DesktopTfm=net472"/>
<NuspecProperty Include="CoreTfm=net6.0" Condition="'$(DotNetBuildFromSource)' == 'true'"/>
<NuspecProperty Include="CoreTfm=netcoreapp3.1" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
</ItemGroup>

<!--
Workaround for https://github.com/NuGet/Home/issues/6754: cyclic dependency.
-->
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the License.txt file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
Expand Down
22 changes: 10 additions & 12 deletions src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj
View file
Open in desktop
Expand Up @@ -2,18 +2,24 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the License.txt file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- NuGet -->
<!-- NuGet: Using an explicit nuspec file to customize TFM directory -->
<IsPackable>true</IsPackable>
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<NuspecBasePath>$(OutputPath)</NuspecBasePath>

<PackageDescription>MSBuild tasks providing git repository information.</PackageDescription>
<PackageTags>MSBuild Tasks source control git</PackageTags>
<DevelopmentDependency>true</DevelopmentDependency>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>

<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetTfmSpecificFilesToPackage</TargetsForTfmSpecificContentInPackage>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCore)" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\NullableAttributes.cs" Link="Common\NullableAttributes.cs" />
<Compile Include="..\Common\Names.cs" Link="Common\Names.cs" />
Expand All @@ -26,12 +32,4 @@
<InternalsVisibleTo Include="Microsoft.Build.Tasks.Git.UnitTests" />
<InternalsVisibleTo Include="Microsoft.SourceLink.Git.IntegrationTests" />
</ItemGroup>

<Target Name="_GetTfmSpecificFilesToPackage" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<ItemGroup>
<TfmSpecificPackageFile Include="$(TargetDir)System.Collections.Immutable.dll" PackagePath="tools/$(TargetFramework)"/>
</ItemGroup>
</Target>

<Import Project="$(RepositoryEngineeringDir)BuildTask.targets"/>
</Project>
15 changes: 15 additions & 0 deletions src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.nuspec
View file
Open in desktop
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
$CommonMetadataElements$
</metadata>
<files>
$CommonFileElements$
<file src="$DesktopTfm$*\**\Microsoft.Build.Tasks.Git.*" exclude="**\*.config" target="tools" />
<file src="$DesktopTfm$*\System.Collections.Immutable.dll" target="tools\net472" />
<file src="$CoreTfm$\**\Microsoft.Build.Tasks.Git.*" target="tools\core" />

<file src="$ProjectDirectory$\build\*.*" target="build" />
<file src="$ProjectDirectory$\buildMultiTargeting\*.*" target="buildMultiTargeting" />
</files>
</package>
2 changes: 1 addition & 1 deletion src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props
View file
Open in desktop
Expand Up @@ -3,6 +3,6 @@
<Project>
<PropertyGroup>
<MicrosoftBuildTasksGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
<MicrosoftBuildTasksGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
<MicrosoftBuildTasksGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
</PropertyGroup>
</Project>
27 changes: 9 additions & 18 deletions src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.csproj
View file
Open in desktop
Expand Up @@ -7,14 +7,20 @@
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>

<!-- Using an explicit nuspec file since NuGet Pack target currently doesn't support including dependencies in tools packages -->
<!-- NuGet: Using an explicit nuspec file to customize TFM directory -->
<IsPackable>true</IsPackable>
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<NuspecBasePath>$(OutputPath)</NuspecBasePath>

<PackageDescription>MSBuild tasks providing TFVC repository information.</PackageDescription>
<PackageTags>MSBuild Tasks TFVC source link</PackageTags>
<DevelopmentDependency>true</DevelopmentDependency>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>

<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_GetTfmSpecificFilesToPackage</TargetsForTfmSpecificContentInPackage>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCore)" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\NullableAttributes.cs" Link="Common\NullableAttributes.cs" />
<Compile Include="..\Common\PathUtilities.cs" Link="Common\PathUtilities.cs" />
Expand All @@ -25,19 +31,4 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCore)" />
<PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="$(MicrosoftTeamFoundationServerExtendedClientVersion)" />
</ItemGroup>

<Target Name="_GetTfmSpecificFilesToPackage">
<ItemGroup>
<TfmSpecificPackageFile Include="$(TargetDir)Microsoft.TeamFoundation.Client.dll" PackagePath="tools\$(TargetFramework)" />
<TfmSpecificPackageFile Include="$(TargetDir)Microsoft.TeamFoundation.Common.dll" PackagePath="tools\$(TargetFramework)" />
<TfmSpecificPackageFile Include="$(TargetDir)Microsoft.TeamFoundation.Core.WebApi.dll" PackagePath="tools\$(TargetFramework)" />
<TfmSpecificPackageFile Include="$(TargetDir)Microsoft.TeamFoundation.VersionControl.Client.dll" PackagePath="tools\$(TargetFramework)" />
<TfmSpecificPackageFile Include="$(TargetDir)Microsoft.TeamFoundation.VersionControl.Common.dll" PackagePath="tools\$(TargetFramework)" />
<TfmSpecificPackageFile Include="$(TargetDir)Microsoft.VisualStudio.Services.Client.Interactive.dll" PackagePath="tools\$(TargetFramework)" />
<TfmSpecificPackageFile Include="$(TargetDir)Microsoft.VisualStudio.Services.Common.dll" PackagePath="tools\$(TargetFramework)" />
<TfmSpecificPackageFile Include="$(TargetDir)Microsoft.VisualStudio.Services.WebApi.dll" PackagePath="tools\$(TargetFramework)" />
</ItemGroup>
</Target>

<Import Project="$(RepositoryEngineeringDir)BuildTask.targets" />
</Project>
20 changes: 10 additions & 10 deletions src/Microsoft.Build.Tasks.Tfvc/Microsoft.Build.Tasks.Tfvc.nuspec
View file
Open in desktop
Expand Up @@ -4,16 +4,16 @@
$CommonMetadataElements$
</metadata>
<files>
$CommonMetadataFiles$
<file src="net461\Microsoft.Build.Tasks.Tfvc.*" target="tools\net461" />
<file src="net461\Microsoft.TeamFoundation.Client.dll" target="tools\net461" />
<file src="net461\Microsoft.TeamFoundation.Common.dll" target="tools\net461" />
<file src="net461\Microsoft.TeamFoundation.Core.WebApi.dll" target="tools\net461" />
<file src="net461\Microsoft.TeamFoundation.VersionControl.Client.dll" target="tools\net461" />
<file src="net461\Microsoft.TeamFoundation.VersionControl.Common.dll" target="tools\net461" />
<file src="net461\Microsoft.VisualStudio.Services.Client.Interactive.dll" target="tools\net461" />
<file src="net461\Microsoft.VisualStudio.Services.Common.dll" target="tools\net46" />
<file src="net461\Microsoft.VisualStudio.Services.WebApi.dll" target="tools\net46" />
$CommonFileElements$
<file src="$DesktopTfm$*\**\Microsoft.Build.Tasks.Tfvc.*" exclude="**\*.config" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.TeamFoundation.Client.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.TeamFoundation.Common.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.TeamFoundation.Core.WebApi.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.TeamFoundation.VersionControl.Client.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.TeamFoundation.VersionControl.Common.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.VisualStudio.Services.Client.Interactive.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.VisualStudio.Services.Common.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.VisualStudio.Services.WebApi.*" target="tools" />

<file src="$ProjectDirectory$\build\*.*" target="build" />
<file src="$ProjectDirectory$\build\*.*" target="buildMultiTargeting" />
Expand Down
2 changes: 1 addition & 1 deletion src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the License.txt file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

Expand Down
3 changes: 2 additions & 1 deletion src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.nuspec
View file
Open in desktop
Expand Up @@ -9,7 +9,8 @@
</metadata>
<files>
$CommonFileElements$
<file src="**\Microsoft.SourceLink.AzureDevOpsServer.Git.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.SourceLink.AzureDevOpsServer.Git.*" exclude="**\*.config" target="tools" />
<file src="$CoreTfm$\**\Microsoft.SourceLink.AzureDevOpsServer.Git.*" target="tools\core" />

<file src="$ProjectDirectory$\build\*.*" target="build" />
<file src="$ProjectDirectory$\buildMultiTargeting\*.*" target="buildMultiTargeting" />
Expand Down
2 changes: 1 addition & 1 deletion ...SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<Project>
<PropertyGroup>
<_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureDevOpsServer.Git.dll</_SourceLinkAzureDevOpsServerGitAssemblyFile>
<_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.AzureDevOpsServer.Git.dll</_SourceLinkAzureDevOpsServerGitAssemblyFile>
<_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureDevOpsServer.Git.dll</_SourceLinkAzureDevOpsServerGitAssemblyFile>
</PropertyGroup>

<UsingTask TaskName="Microsoft.SourceLink.AzureDevOpsServer.Git.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkAzureDevOpsServerGitAssemblyFile)"/>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the License.txt file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

Expand Down
3 changes: 2 additions & 1 deletion src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.nuspec
View file
Open in desktop
Expand Up @@ -9,7 +9,8 @@
</metadata>
<files>
$CommonFileElements$
<file src="**\Microsoft.SourceLink.AzureRepos.Git.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.SourceLink.AzureRepos.Git.*" exclude="**\*.config" target="tools" />
<file src="$CoreTfm$\**\Microsoft.SourceLink.AzureRepos.Git.*" target="tools\core" />

<file src="$ProjectDirectory$\build\*.*" target="build" />
<file src="$ProjectDirectory$\buildMultiTargeting\*.*" target="buildMultiTargeting" />
Expand Down
2 changes: 1 addition & 1 deletion src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<Project>
<PropertyGroup>
<_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureRepos.Git.dll</_SourceLinkAzureReposGitAssemblyFile>
<_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.AzureRepos.Git.dll</_SourceLinkAzureReposGitAssemblyFile>
<_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureRepos.Git.dll</_SourceLinkAzureReposGitAssemblyFile>
</PropertyGroup>

<UsingTask TaskName="Microsoft.SourceLink.AzureRepos.Git.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkAzureReposGitAssemblyFile)"/>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceLink.AzureRepos.Tfvc/Microsoft.SourceLink.AzureRepos.Tfvc.nuspec
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
</metadata>
<files>
$CommonFileElements$
<file src="**\Microsoft.SourceLink.AzureRepos.Tfvc.*" target="tools" />
<file src="$DesktopTfm$*\**\Microsoft.SourceLink.AzureRepos.Tfvc.*" exclude="**\*.config" target="tools" />

<file src="$ProjectDirectory$\build\*.*" target="build" />
</files>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<Project>
<PropertyGroup>
<_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureRepos.Tfvc.dll</_SourceLinkAzureReposTfvcAssemblyFile>
<_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.AzureRepos.Tfvc.dll</_SourceLinkAzureReposTfvcAssemblyFile>
<_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.AzureRepos.Tfvc.dll</_SourceLinkAzureReposTfvcAssemblyFile>
</PropertyGroup>

<UsingTask TaskName="Microsoft.SourceLink.AzureRepos.Tfvc.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkAzureReposTfvcAssemblyFile)"/>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the License.txt file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

Expand Down
5 changes: 3 additions & 2 deletions src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.nuspec
View file
Open in desktop
Expand Up @@ -9,8 +9,9 @@
</metadata>
<files>
$CommonFileElements$
<file src="**\Microsoft.SourceLink.BitBucket.Git.*" target="tools" />

<file src="$DesktopTfm$*\**\Microsoft.SourceLink.BitBucket.Git.*" exclude="**\*.config" target="tools" />
<file src="$CoreTfm$\**\Microsoft.SourceLink.BitBucket.Git.*" target="tools\core" />

<file src="$ProjectDirectory$\build\*.*" target="build" />
<file src="$ProjectDirectory$\buildMultiTargeting\*.*" target="buildMultiTargeting" />
</files>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
<Project>
<PropertyGroup>
<_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Bitbucket.Git.dll</_SourceLinkBitbucketAssemblyFile>
<_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.Bitbucket.Git.dll</_SourceLinkBitbucketAssemblyFile>
<_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.SourceLink.Bitbucket.Git.dll</_SourceLinkBitbucketAssemblyFile>
</PropertyGroup>

<UsingTask TaskName="Microsoft.SourceLink.Bitbucket.Git.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkBitbucketAssemblyFile)"/>
Expand Down
14 changes: 10 additions & 4 deletions src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
View file
Open in desktop
Expand Up @@ -2,16 +2,24 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the License.txt file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>

<!-- NuGet -->
<!-- NuGet: Using an explicit nuspec file to customize TFM directory -->
<IsPackable>true</IsPackable>
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<NuspecBasePath>$(OutputPath)</NuspecBasePath>

<PackageDescription>MSBuild tasks providing source control information.</PackageDescription>
<PackageTags>MSBuild Tasks source control</PackageTags>
<DevelopmentDependency>true</DevelopmentDependency>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCore)" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Common\NullableAttributes.cs" Link="Common\NullableAttributes.cs" />
<Compile Include="..\Common\Names.cs" Link="Common\Names.cs" />
Expand All @@ -21,6 +29,4 @@
<InternalsVisibleTo Include="Microsoft.SourceLink.Common.UnitTests" />
<InternalsVisibleTo Include="Microsoft.SourceLink.Git.IntegrationTests" />
</ItemGroup>

<Import Project="$(RepositoryEngineeringDir)BuildTask.targets" />
</Project>
14 changes: 14 additions & 0 deletions src/SourceLink.Common/Microsoft.SourceLink.Common.nuspec
View file
Open in desktop
@@ -0,0 +1,14 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
$CommonMetadataElements$
</metadata>
<files>
$CommonFileElements$
<file src="$DesktopTfm$*\**\Microsoft.SourceLink.Common.*" exclude="**\*.config" target="tools" />
<file src="$CoreTfm$\**\Microsoft.SourceLink.Common.*" target="tools\core" />

<file src="$ProjectDirectory$\build\*.*" target="build" />
<file src="$ProjectDirectory$\buildMultiTargeting\*.*" target="buildMultiTargeting" />
</files>
</package>