Skip to content

Commit bdcfd1b

Browse files
arturcicarturcic
committed
#3334 - re-target to .net6.0 and .net7.0 in place of netstandard2.0
1 parent ec8fe7a commit bdcfd1b

File tree

13 files changed

+22
-208
lines changed

13 files changed

+22
-208
lines changed

‎src/Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22
<PropertyGroup>
3+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
35
<EndYear>$([System.DateTime]::Today.Year)</EndYear>
46
<Authors>GitTools and Contributors</Authors>
57
<Copyright>Copyright GitTools $(EndYear).</Copyright>

‎src/GitTools.Testing/GitTools.Testing.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netstandard2.0</TargetFramework>
43
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
54
</PropertyGroup>
65
<ItemGroup>

‎src/GitVersion.App.Tests/GitVersion.App.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4-
53
<IsTestProject>true</IsTestProject>
64
</PropertyGroup>
75

‎src/GitVersion.App/GitVersion.App.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<OutputType>Exe</OutputType>
55
<RootNamespace>GitVersion</RootNamespace>
66
<AssemblyName>gitversion</AssemblyName>
7-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
87
<PlatformTarget>AnyCPU</PlatformTarget>
98
<PackageLicenseExpression>MIT</PackageLicenseExpression>
109
</PropertyGroup>

‎src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5-
64
<DebugType>full</DebugType>
75
<Optimize>false</Optimize>
86
<DebugSymbols>true</DebugSymbols>

‎src/GitVersion.Core/Extensions/CallerArgumentExpressionAttribute.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/GitVersion.Core/Extensions/NullableAttributes.cs

Lines changed: 0 additions & 147 deletions
This file was deleted.

‎src/GitVersion.Core/GitVersion.Core.csproj

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
54
<RootNamespace>GitVersion</RootNamespace>
65
<DocumentationFile>bin\$(Configuration)\GitVersionCore.xml</DocumentationFile>
76

@@ -14,26 +13,26 @@
1413
</PropertyGroup>
1514

1615
<ItemGroup>
17-
<PackageReference Include="Polly"/>
18-
<PackageReference Include="System.Net.Requests"/>
16+
<PackageReference Include="Polly" />
17+
<PackageReference Include="System.Net.Requests" />
1918

20-
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All"/>
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"/>
22-
<PackageReference Include="Microsoft.Extensions.Options"/>
23-
<PackageReference Include="YamlDotNet"/>
19+
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
21+
<PackageReference Include="Microsoft.Extensions.Options" />
22+
<PackageReference Include="YamlDotNet" />
2423
</ItemGroup>
2524

2625
<ItemGroup>
27-
<Compile Remove="VersionConverters\*\AddFormats\**\*.*"/>
28-
<Compile Remove="VersionConverters\*\Templates\**\*.*"/>
29-
<EmbeddedResource Include="VersionConverters\*\AddFormats\**\*.*"/>
30-
<EmbeddedResource Include="VersionConverters\*\Templates\**\*.*"/>
26+
<Compile Remove="VersionConverters\*\AddFormats\**\*.*" />
27+
<Compile Remove="VersionConverters\*\Templates\**\*.*" />
28+
<EmbeddedResource Include="VersionConverters\*\AddFormats\**\*.*" />
29+
<EmbeddedResource Include="VersionConverters\*\Templates\**\*.*" />
3130
</ItemGroup>
3231

3332
<ItemGroup>
34-
<InternalsVisibleTo Include="GitVersion.Core.Tests"/>
35-
<InternalsVisibleTo Include="GitVersion.App.Tests"/>
36-
<InternalsVisibleTo Include="GitVersion.MsBuild.Tests"/>
33+
<InternalsVisibleTo Include="GitVersion.Core.Tests" />
34+
<InternalsVisibleTo Include="GitVersion.App.Tests" />
35+
<InternalsVisibleTo Include="GitVersion.MsBuild.Tests" />
3736
</ItemGroup>
3837

3938
</Project>

‎src/GitVersion.Core/Helpers/ProcessHelper.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.ComponentModel;
22
using System.Runtime.InteropServices;
3-
using GitVersion.Extensions;
43

54
namespace GitVersion.Helpers;
65

‎src/GitVersion.LibGit2Sharp/GitVersion.LibGit2Sharp.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
</PropertyGroup>
6-
73
<ItemGroup>
84
<PackageReference Include="LibGit2Sharp"/>
95
</ItemGroup>

‎src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
5-
64
<IsTestProject>true</IsTestProject>
75
</PropertyGroup>
86

‎src/GitVersion.MsBuild/GitVersion.MsBuild.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
64
<PackageId>GitVersion.MsBuild</PackageId>
75
<Title>GitVersionMsBuild</Title>
86
<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>

‎src/GitVersion.MsBuild/nuget-files.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<Target_net70>tools/net7.0</Target_net70>
88
</PropertyGroup>
99
<ItemGroup Condition="$(IsPackaging) != ''">
10-
<None Include="msbuild/tools/*.*" Pack="true" PackagePath="tools" />
11-
<None Include="msbuild/build/*.*" Pack="true" PackagePath="build" />
12-
<None Include="msbuild/buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
10+
<None Include="msbuild/tools/*.*" Pack="true" PackagePath="tools" />
11+
<None Include="msbuild/build/*.*" Pack="true" PackagePath="build" />
12+
<None Include="msbuild/buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
1313

14-
<None Include="$(PublishTask_net60)/**/*" Pack="true" PackagePath="$(Target_net60)" />
15-
<None Include="$(PublishTask_net70)/**/*" Pack="true" PackagePath="$(Target_net70)" />
16-
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net60)" />
17-
<None Include="bin/$(Configuration)/netstandard2.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net70)" />
14+
<None Include="$(PublishTask_net60)/**/*" Pack="true" PackagePath="$(Target_net60)" />
15+
<None Include="$(PublishTask_net70)/**/*" Pack="true" PackagePath="$(Target_net70)" />
16+
<None Include="bin/$(Configuration)/net6.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net60)" />
17+
<None Include="bin/$(Configuration)/net7.0/GitVersion.MsBuild.*" Pack="true" PackagePath="$(Target_net70)" />
1818
</ItemGroup>
1919
</Project>

0 commit comments

Comments
 (0)