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 "<RollForward>...</RollForward>" 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.
dotnet · Apr 18, 2023 · 772a4ff · 772a4ff
1 parent d4e7ffb
commit 772a4ff
Show file tree

Hide file tree

Showing 78 changed files with 417 additions and 359 deletions.
diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
- <PropertyGroup>
- <PublishingVersion>3</PublishingVersion>
- </PropertyGroup>
+
+ <PropertyGroup>
+ <PublishingVersion>3</PublishingVersion>
+ </PropertyGroup>
+
 </Project>
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
@@ -1,18 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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>
+<Project>
 
  <PropertyGroup>
  <GitHubRepositoryName>sourcelink</GitHubRepositoryName>
  <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
  <SourceBuildTrimNetFrameworkTargets>true</SourceBuildTrimNetFrameworkTargets>
  </PropertyGroup>
 
- <Target Name="GetRepoSourceBuildCommandConfiguration"
- BeforeTargets="GetSourceBuildCommandConfiguration">
- <PropertyGroup>
- <InnerBuildArgs>$(InnerBuildArgs) /p:Pack=true</InnerBuildArgs>
- </PropertyGroup>
- </Target>
-
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,25 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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>
+
  <PropertyGroup>
  <!-- This repo version -->
  <VersionPrefix>8.0.0</VersionPrefix>
  <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
  <!-- Opt-in repo features -->
  <UsingToolSymbolUploader>true</UsingToolSymbolUploader>
+ <!-- msbuild -->
  <MicrosoftBuildVersion>17.3.2</MicrosoftBuildVersion>
- <MicrosoftBuildTasksCore>17.3.2</MicrosoftBuildTasksCore>
- <!-- TODO: Remove after https://github.com/dotnet/arcade/pull/13178 is consumed. -->
- <MicrosoftNETTestSdkVersion>17.5.0</MicrosoftNETTestSdkVersion>
- <MicrosoftTeamFoundationServerExtendedClientVersion>19.210.0-preview</MicrosoftTeamFoundationServerExtendedClientVersion>
+ <MicrosoftBuildTasksCoreVersion>17.3.2</MicrosoftBuildTasksCoreVersion>
+ <!-- nuget -->
  <NuGetVersioningVersion>5.7.0</NuGetVersioningVersion>
- <NuGetPackagingVersion>5.7.0</NuGetPackagingVersion>
+ <!-- commandline -->
  <SystemCommandLineVersion>2.0.0-beta4.22272.1</SystemCommandLineVersion>
  <SystemCommandLineNamingConventionBinderVersion>2.0.0-beta4.22272.1</SystemCommandLineNamingConventionBinderVersion>
  <SystemCommandLineRenderingVersion>0.4.0-alpha.22272.1</SystemCommandLineRenderingVersion>
+ <!-- runtime-->
  <SystemTextJsonVersion>7.0.2</SystemTextJsonVersion>
- <XunitCombinatorialVersion>1.5.25</XunitCombinatorialVersion>
+ <!-- external -->
+ <MicrosoftTeamFoundationServerExtendedClientVersion>19.210.0-preview</MicrosoftTeamFoundationServerExtendedClientVersion>
  <!-- libgit2 used for integration tests -->
  <LibGit2SharpVersion>0.27.0-preview-0119</LibGit2SharpVersion>
+ <XunitCombinatorialVersion>1.5.25</XunitCombinatorialVersion>
  </PropertyGroup>
+
 </Project>
diff --git a/eng/runtimeconfig.template.json b/eng/runtimeconfig.template.json
diff --git 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
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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>
+<Project>
  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
  <PropertyGroup>
  <LangVersion>Preview</LangVersion>
  <Nullable>enable</Nullable>
  <PackageLicenseExpression>MIT</PackageLicenseExpression>
  <GenerateResxSource>true</GenerateResxSource>
- <UserRuntimeConfig Condition="$(TargetFramework.StartsWith('netcoreapp'))">$(RepositoryEngineeringDir)runtimeconfig.template.json</UserRuntimeConfig>
 
  <!-- Produce snupkg in official builds (when not embedding PDBs to dlls) -->
  <IncludeSymbols Condition="'$(DebugType)' != 'embedded'">true</IncludeSymbols>
@@ -21,4 +18,5 @@
  <PropertyGroup Condition="'$(IsTestProject)' != 'true'">
  <GenerateDependencyFile>false</GenerateDependencyFile>
  </PropertyGroup>
+
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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>
+<Project>
+
  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
+ <!-- TODO: Remove when Arcade offers an in-built way to filter out anything other than NetCurrent. -->
+ <PropertyGroup>
+ <TargetFrameworks Condition="'$(TargetFrameworks)' != '' and '$(DotNetBuildFromSource)' == 'true'">$(NetCurrent)</TargetFrameworks>
+ </PropertyGroup>
+
  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
  <!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
  <PackageReference Include="NETStandard.Library" Version="2.0.3" Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'" />
@@ -40,4 +44,5 @@
  <PackageId Condition="'$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
  </PropertyGroup>
  </Target>
+
 </Project>
diff --git a/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj b/src/Microsoft.Build.StandardCI/Microsoft.Build.StandardCI.csproj
@@ -1,32 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
- <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
- <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
- <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+<Project Sdk="Microsoft.Build.NoTargets">
 
- <!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
+ <PropertyGroup>
+ <TargetFramework>netstandard2.0</TargetFramework>
  <IsPackable>true</IsPackable>
- <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
- <NuspecBasePath>$(OutputPath)</NuspecBasePath>
-
+ <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
  <PackageDescription>Standard CI targets.</PackageDescription>
  <PackageTags>Standard CI msbuild targets</PackageTags>
  <DevelopmentDependency>true</DevelopmentDependency>
- <IncludeBuildOutput>false</IncludeBuildOutput>
- <IncludeSymbols>false</IncludeSymbols>
+ <!-- This is a content only package. -->
+ <NoWarn>$(NoWarn);NU5128</NoWarn>
+ <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
  </PropertyGroup>
 
  <ItemGroup>
- <Compile Include="..\Common\NullableAttributes.cs" Link="Common\NullableAttributes.cs" />
+ <None Include="build\Microsoft.Build.StandardCI.props"
+ Pack="true"
+ PackagePath="build" />
  </ItemGroup>
 
- <!-- Nothing to build, just create packages -->
- <Target Name="Build">
- <MakeDir Directories="$(IntermediateOutputPath)" ContinueOnError="True" />
- </Target>
-
- <Target Name="Test" />
 </Project>
diff --git a/src/Microsoft.Build.StandardCI/build/Microsoft.Build.StandardCI.props b/src/Microsoft.Build.StandardCI/build/Microsoft.Build.StandardCI.props
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
+
  <!--
  Default values for properties initialized from Standard CI environment variables.
  See https://github.com/dotnet/sourcelink/tree/master/docs/StandardCI.
@@ -39,4 +39,5 @@
  -->
  <RepositoryType Condition="'$(RepositoryType)' == ''">$(STANDARD_CI_REPOSITORY_TYPE)</RepositoryType>
  </PropertyGroup>
+
 </Project>
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
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net472;$(NetCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCurrent);net472</TargetFrameworks>
  </PropertyGroup>
 
  <ItemGroup>
+ <PackageReference Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
  <ProjectReference Include="..\Microsoft.Build.Tasks.Git\Microsoft.Build.Tasks.Git.csproj" />
  <ProjectReference Include="..\TestUtilities\TestUtilities.csproj" />
  </ItemGroup>

diff --git 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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">
+<Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
- <TargetFrameworks>net472;$(NetMinimum);$(NetCurrent)</TargetFrameworks>
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(NetCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCurrent);$(NetMinimum);net472</TargetFrameworks>
  <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
 
  <!-- NuGet: Using an explicit nuspec file to customize TFM directory -->
@@ -16,20 +14,24 @@
  <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" />
+ <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
  </ItemGroup>
+
  <ItemGroup>
  <Compile Include="..\Common\NullableAttributes.cs" Link="Common\NullableAttributes.cs" />
  <Compile Include="..\Common\Names.cs" Link="Common\Names.cs" />
  <Compile Include="..\Common\ValueTuple.cs" Link="Common\ValueTuple.cs" />
  <Compile Include="..\Common\PathUtilities.cs" Link="Common\PathUtilities.cs" />
  <Compile Include="..\Common\SequenceComparer.cs" Link="Common\SequenceComparer.cs" />
  </ItemGroup>
+
  <ItemGroup>
  <InternalsVisibleTo Include="Microsoft.Build.Tasks.Git.Operations" />
  <InternalsVisibleTo Include="Microsoft.Build.Tasks.Git.UnitTests" />
  <InternalsVisibleTo Include="Microsoft.SourceLink.Git.IntegrationTests" />
  </ItemGroup>
+
 </Project>
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
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
+
  <PropertyGroup>
  <MicrosoftBuildTasksGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
  <MicrosoftBuildTasksGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\core\Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
  </PropertyGroup>
+
 </Project>
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
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
+
  <UsingTask TaskName="Microsoft.Build.Tasks.Git.LocateRepository" AssemblyFile="$(MicrosoftBuildTasksGitAssemblyFile)"/>
  <UsingTask TaskName="Microsoft.Build.Tasks.Git.GetUntrackedFiles" AssemblyFile="$(MicrosoftBuildTasksGitAssemblyFile)"/>
 
@@ -46,7 +46,6 @@
  -->
  <Target Name="SetEmbeddedFilesFromSourceControlManagerUntrackedFiles"
  DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager">
-
  <Microsoft.Build.Tasks.Git.GetUntrackedFiles
  RepositoryId="$(_GitRepositoryId)"
  ConfigurationScope="$(GitRepositoryConfigurationScope)"

diff --git a/src/Microsoft.Build.Tasks.Git/buildMultiTargeting/Microsoft.Build.Tasks.Git.props b/src/Microsoft.Build.Tasks.Git/buildMultiTargeting/Microsoft.Build.Tasks.Git.props
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
- <Import Project="..\build\$(MSBuildThisFileName).props"/>
+
+ <Import Project="..\build\$(MSBuildThisFileName).props" />
+
 </Project>
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
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
- <Import Project="..\build\$(MSBuildThisFileName).targets"/>
+
+ <Import Project="..\build\$(MSBuildThisFileName).targets" />
+
 </Project>
diff --git 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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">
+<Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
  <TargetFramework>net472</TargetFramework>
  <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
- <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
  <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
 
  <!-- NuGet: Using an explicit nuspec file to customize TFM directory -->
@@ -17,14 +15,17 @@
  <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" />
+ <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
+ <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
  <PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="$(MicrosoftTeamFoundationServerExtendedClientVersion)" />
  </ItemGroup>
+
  <ItemGroup>
  <Compile Include="..\Common\NullableAttributes.cs" Link="Common\NullableAttributes.cs" />
  <Compile Include="..\Common\PathUtilities.cs" Link="Common\PathUtilities.cs" />
  <Compile Include="..\Common\UriUtilities.cs" Link="Common\UriUtilities.cs" />
  </ItemGroup>
+
 </Project>
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
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
+
  <PropertyGroup>
  <MicrosoftBuildTasksTfvcAssemblyFile>$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Build.Tasks.Tfvc.dll</MicrosoftBuildTasksTfvcAssemblyFile>
  </PropertyGroup>
+
 </Project>
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
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
+
  <UsingTask TaskName="Microsoft.Build.Tasks.Tfvc.LocateRepository" AssemblyFile="$(MicrosoftBuildTasksTfvcAssemblyFile)"/>
  <UsingTask TaskName="Microsoft.Build.Tasks.Tfvc.GetSourceRoots" AssemblyFile="$(MicrosoftBuildTasksTfvcAssemblyFile)"/>
  <UsingTask TaskName="Microsoft.Build.Tasks.Tfvc.GetRepositoryUrl" AssemblyFile="$(MicrosoftBuildTasksTfvcAssemblyFile)"/>
@@ -41,7 +41,6 @@
  -->
  <Target Name="SetEmbeddedFilesFromSourceControlManagerUntrackedFiles"
  DependsOnTargets="InitializeSourceControlInformationFromSourceControlManager">
-
  <Microsoft.Build.Tasks.Tfvc.GetUntrackedFiles WorkspaceDirectory="$(_TfvcWorkspaceDirectory)" ProjectDirectory="$(MSBuildProjectDirectory)" Files="@(Compile)">
  <Output TaskParameter="UntrackedFiles" ItemName="EmbeddedFiles" />
  </Microsoft.Build.Tasks.Tfvc.GetUntrackedFiles>

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
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
- <Import Project="..\build\$(MSBuildThisFileName).props"/>
+
+ <Import Project="..\build\$(MSBuildThisFileName).props" />
+
 </Project>
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
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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>
- <Import Project="..\build\$(MSBuildThisFileName).targets"/>
+
+ <Import Project="..\build\$(MSBuildThisFileName).targets" />
+
 </Project>
diff --git a/...ureDevOpsServer.Git.UnitTests/Microsoft.SourceLink.AzureDevOpsServer.Git.UnitTests.csproj b/...ureDevOpsServer.Git.UnitTests/Microsoft.SourceLink.AzureDevOpsServer.Git.UnitTests.csproj
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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">
+<Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
- <TargetFrameworks>net472;$(NetCurrent)</TargetFrameworks>
+ <TargetFrameworks>$(NetCurrent);net472</TargetFrameworks>
  </PropertyGroup>
+
  <ItemGroup>
  <ProjectReference Include="..\SourceLink.AzureDevOpsServer.Git\Microsoft.SourceLink.AzureDevOpsServer.Git.csproj" />
  <ProjectReference Include="..\TestUtilities\TestUtilities.csproj" />
  </ItemGroup>
+
 </Project>