GitTools#3334 - re-target to .net6.0 and .net7.0 in place of netstand…

…ard2.0
arturcic · Feb 17, 2023 · 6c70392 · 6c70392
1 parent 7cee737
commit 6c70392
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 208 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,7 @@
 <Project>
     <PropertyGroup>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+
         <EndYear>$([System.DateTime]::Today.Year)</EndYear>
         <Authors>GitTools and Contributors</Authors>
         <Copyright>Copyright GitTools $(EndYear).</Copyright>

diff --git a/src/GitTools.Testing/GitTools.Testing.csproj b/src/GitTools.Testing/GitTools.Testing.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     </PropertyGroup>
     <ItemGroup>

diff --git a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
 

diff --git a/src/GitVersion.App/GitVersion.App.csproj b/src/GitVersion.App/GitVersion.App.csproj
@@ -4,7 +4,6 @@
         <OutputType>Exe</OutputType>
         <RootNamespace>GitVersion</RootNamespace>
         <AssemblyName>gitversion</AssemblyName>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>

diff --git a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
         <DebugSymbols>true</DebugSymbols>

diff --git a/src/GitVersion.Core/Extensions/CallerArgumentExpressionAttribute.cs b/src/GitVersion.Core/Extensions/CallerArgumentExpressionAttribute.cs
diff --git a/src/GitVersion.Core/Extensions/NullableAttributes.cs b/src/GitVersion.Core/Extensions/NullableAttributes.cs
diff --git a/src/GitVersion.Core/GitVersion.Core.csproj b/src/GitVersion.Core/GitVersion.Core.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>GitVersion</RootNamespace>
         <DocumentationFile>bin\$(Configuration)\GitVersionCore.xml</DocumentationFile>
 
@@ -14,26 +13,26 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Polly"/>
-        <PackageReference Include="System.Net.Requests"/>
+        <PackageReference Include="Polly" />
+        <PackageReference Include="System.Net.Requests" />
 
-        <PackageReference Include="JetBrains.Annotations" PrivateAssets="All"/>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"/>
-        <PackageReference Include="Microsoft.Extensions.Options"/>
-        <PackageReference Include="YamlDotNet"/>
+        <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+        <PackageReference Include="Microsoft.Extensions.Options" />
+        <PackageReference Include="YamlDotNet" />
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Remove="VersionConverters\*\AddFormats\**\*.*"/>
-        <Compile Remove="VersionConverters\*\Templates\**\*.*"/>
-        <EmbeddedResource Include="VersionConverters\*\AddFormats\**\*.*"/>
-        <EmbeddedResource Include="VersionConverters\*\Templates\**\*.*"/>
+        <Compile Remove="VersionConverters\*\AddFormats\**\*.*" />
+        <Compile Remove="VersionConverters\*\Templates\**\*.*" />
+        <EmbeddedResource Include="VersionConverters\*\AddFormats\**\*.*" />
+        <EmbeddedResource Include="VersionConverters\*\Templates\**\*.*" />
     </ItemGroup>
 
     <ItemGroup>
-        <InternalsVisibleTo Include="GitVersion.Core.Tests"/>
-        <InternalsVisibleTo Include="GitVersion.App.Tests"/>
-        <InternalsVisibleTo Include="GitVersion.MsBuild.Tests"/>
+        <InternalsVisibleTo Include="GitVersion.Core.Tests" />
+        <InternalsVisibleTo Include="GitVersion.App.Tests" />
+        <InternalsVisibleTo Include="GitVersion.MsBuild.Tests" />
     </ItemGroup>
 
 </Project>
diff --git a/src/GitVersion.Core/Helpers/ProcessHelper.cs b/src/GitVersion.Core/Helpers/ProcessHelper.cs
@@ -1,6 +1,5 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using GitVersion.Extensions;
 
 namespace GitVersion.Helpers;
 

diff --git a/src/GitVersion.LibGit2Sharp/GitVersion.LibGit2Sharp.csproj b/src/GitVersion.LibGit2Sharp/GitVersion.LibGit2Sharp.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-    </PropertyGroup>
-
     <ItemGroup>
         <PackageReference Include="LibGit2Sharp"/>
     </ItemGroup>

diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
-
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
 

diff --git a/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj b/src/GitVersion.MsBuild/GitVersion.MsBuild.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-
         <PackageId>GitVersion.MsBuild</PackageId>
         <Title>GitVersionMsBuild</Title>
         <PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>

diff --git a/src/GitVersion.MsBuild/nuget-files.props b/src/GitVersion.MsBuild/nuget-files.props
@@ -7,13 +7,13 @@
         <Target_net70>tools/net7.0</Target_net70>
     </PropertyGroup>
     <ItemGroup Condition="$(IsPackaging) != ''">
-        <None Include="msbuild/tools/*.*"                                        Pack="true" PackagePath="tools" />
-        <None Include="msbuild/build/*.*"                                        Pack="true" PackagePath="build" />
-        <None Include="msbuild/buildMultiTargeting/*.*"                          Pack="true" PackagePath="buildMultiTargeting" />
+        <None Include="msbuild/tools/*.*"                                Pack="true" PackagePath="tools" />
+        <None Include="msbuild/build/*.*"                                Pack="true" PackagePath="build" />
+        <None Include="msbuild/buildMultiTargeting/*.*"                  Pack="true" PackagePath="buildMultiTargeting" />
 
-        <None Include="$(PublishTask_net60)/**/*"                                Pack="true" PackagePath="$(Target_net60)" />
-        <None Include="$(PublishTask_net70)/**/*"                                Pack="true" PackagePath="$(Target_net70)" />
-        <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net60)" />
-        <None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net70)" />
+        <None Include="$(PublishTask_net60)/**/*"                        Pack="true" PackagePath="$(Target_net60)" />
+        <None Include="$(PublishTask_net70)/**/*"                        Pack="true" PackagePath="$(Target_net70)" />
+        <None Include="bin/$(Configuration)/net6.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net60)" />
+        <None Include="bin/$(Configuration)/net7.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net70)" />
     </ItemGroup>
 </Project>