Skip to content

Commit 425e488

Browse files
arturcicarturcic
committed
rename GitVersionTask to GitVersion.MsBuild
1 parent ad3dfb5 commit 425e488

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+73
-342
lines changed

‎src/GitVersionTask.Tests/AssemblyLocation.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/AssemblyLocation.cs

File renamed without changes.

‎src/GitVersionTask.Tests/AssemblyParallelizable.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/AssemblyParallelizable.cs

File renamed without changes.

‎src/GitVersionTask.Tests/GetVersionTaskTests.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/GetVersionTaskTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using System.Linq;
1+
using System.Linq;
22
using GitVersion;
3-
using GitVersionTask.Task;
3+
using GitVersion.MsBuild.Task;
4+
using GitVersionTask;
45
using Microsoft.Build.Framework;
56
using NUnit.Framework;
67
using Shouldly;

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj renamed to ‎src/GitVersion.MsBuild.Task.Tests/GitVersion.MsBuild.Task.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Content Include="Approved\**\*.txt" />
2424
</ItemGroup>
2525
<ItemGroup>
26-
<ProjectReference Include="..\GitVersionTask\GitVersionTask.csproj" />
26+
<ProjectReference Include="..\GitVersion.MsBuild\GitVersion.MsBuild.csproj" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

‎src/GitVersionTask.Tests/GitVersionTaskDirectoryTests.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/GitVersionTaskDirectoryTests.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Helpers/DirectoryHelper.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Helpers/DirectoryHelper.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Helpers/IPostTestDirectoryRemover.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Helpers/IPostTestDirectoryRemover.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Helpers/PathHelper.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Helpers/PathHelper.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Helpers/Scrubbers.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Helpers/Scrubbers.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Helpers/SelfCleaningDirectory.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Helpers/SelfCleaningDirectory.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Helpers/TestEffectiveConfiguration.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Helpers/TestEffectiveConfiguration.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Helpers/TestFileSystem.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Helpers/TestFileSystem.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Helpers/TestStream.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Helpers/TestStream.cs

File renamed without changes.

‎src/GitVersionTask.Tests/InvalidFileCheckerTests.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/InvalidFileCheckerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.IO;
33
using GitVersion;
4-
using GitVersionTask;
4+
using GitVersion.MsBuild;
55
using GitVersionTask.Tests.Mocks;
66
using Microsoft.Build.Framework;
77
using NUnit.Framework;

‎src/GitVersionTask.Tests/Mocks/MockBuildEngine.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Mocks/MockBuildEngine.cs

File renamed without changes.

‎src/GitVersionTask.Tests/Mocks/MockTaskItem.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/Mocks/MockTaskItem.cs

File renamed without changes.

‎src/GitVersionTask.Tests/ModuleInitializer.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/ModuleInitializer.cs

File renamed without changes.

‎src/GitVersionTask.Tests/TestBase.cs renamed to ‎src/GitVersion.MsBuild.Task.Tests/TestBase.cs

File renamed without changes.

‎src/GitVersionTask.Task/GenerateGitVersionInformation.cs renamed to ‎src/GitVersion.MsBuild.Task/GenerateGitVersionInformation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersionTask.Task
1+
namespace GitVersion.MsBuild.Task
22
{
33
using Microsoft.Build.Framework;
44

‎src/GitVersionTask.Task/GetVersion.cs renamed to ‎src/GitVersion.MsBuild.Task/GetVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersionTask.Task
1+
namespace GitVersion.MsBuild.Task
22
{
33
using Microsoft.Build.Framework;
44

‎src/GitVersionTask.Task/GitVersionTask.Task.csproj renamed to ‎src/GitVersion.MsBuild.Task/GitVersion.MsBuild.Task.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
2-
33
<PropertyGroup>
44
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
55
</PropertyGroup>
@@ -11,12 +11,11 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<InternalsVisibleTo Include="GitVersionTask" />
14+
<InternalsVisibleTo Include="GitVersion.MsBuild" />
1515
</ItemGroup>
1616

1717
<ItemGroup>
1818
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
1919
</ItemGroup>
2020

21-
2221
</Project>

‎src/GitVersionTask.Task/GitVersionTaskBase.cs renamed to ‎src/GitVersion.MsBuild.Task/GitVersionTaskBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersionTask.Task
1+
namespace GitVersion.MsBuild.Task
22
{
33
using Microsoft.Build.Framework;
44
using Microsoft.Build.Utilities;

‎src/GitVersionTask.Task/LibGit2Sharp/GitLoaderContext.cs renamed to ‎src/GitVersion.MsBuild.Task/LibGit2Sharp/GitLoaderContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This code originally copied from https://raw.githubusercontent.com/dotnet/sourcelink/master/src/Microsoft.Build.Tasks.Git/GitLoaderContext.cs
22
#if !NET461
3-
namespace GitVersionTask.Task.LibGit2Sharp
3+
namespace GitVersion.MsBuild.Task.LibGit2Sharp
44
{
55
using System;
66
using System.IO;

‎src/GitVersionTask.Task/LibGit2Sharp/LibGit2SharpLoader.cs renamed to ‎src/GitVersion.MsBuild.Task/LibGit2Sharp/LibGit2SharpLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This code originally copied and adapted from https://raw.githubusercontent.com/dotnet/sourcelink/master/src/Microsoft.Build.Tasks.Git/TaskImplementation.cs
22

3-
namespace GitVersionTask.Task.LibGit2Sharp
3+
namespace GitVersion.MsBuild.Task.LibGit2Sharp
44
{
55
using System;
66
using System.Collections.Generic;

‎src/GitVersionTask.Task/LibGit2Sharp/RuntimeIdMap.cs renamed to ‎src/GitVersion.MsBuild.Task/LibGit2Sharp/RuntimeIdMap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// This code originally copied from https://raw.githubusercontent.com/dotnet/sourcelink/master/src/Microsoft.Build.Tasks.Git/RuntimeIdMap.cs
22
#if !NET461
33

4-
namespace GitVersionTask.Task.LibGit2Sharp
4+
namespace GitVersion.MsBuild.Task.LibGit2Sharp
55
{
66
using System;
77
using System.Diagnostics;

‎src/GitVersionTask.Task/TaskProxy.cs renamed to ‎src/GitVersion.MsBuild.Task/TaskProxy.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
namespace GitVersionTask.Task
1+
namespace GitVersion.MsBuild.Task
22
{
33
using System;
44
using System.Reflection;
5-
using GitVersionTask.Task.LibGit2Sharp;
5+
using GitVersion.MsBuild.Task.LibGit2Sharp;
66

77
public static class TaskProxy
88
{
@@ -16,9 +16,9 @@ static TaskProxy()
1616
#if !NET461
1717
GitLoaderContext.Init("GitVersionCore", "LibGit2Sharp");
1818
#endif
19-
LibGit2SharpLoader.LoadAssembly("GitVersionTask");
19+
LibGit2SharpLoader.LoadAssembly("GitVersion.MsBuild");
2020

21-
var type = LibGit2SharpLoader.Instance.Assembly.GetType("GitVersionTask.GitVersionTasks", throwOnError: true).GetTypeInfo();
21+
var type = LibGit2SharpLoader.Instance.Assembly.GetType("GitVersion.MsBuild.GitVersionTasks", throwOnError: true).GetTypeInfo();
2222

2323
GetVersion = GetMethod<GetVersion>(type, nameof(GetVersion));
2424
GenerateGitVersionInformation = GetMethod<GenerateGitVersionInformation>(type, nameof(GenerateGitVersionInformation));

‎src/GitVersionTask.Task/UpdateAssemblyInfo.cs renamed to ‎src/GitVersion.MsBuild.Task/UpdateAssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersionTask.Task
1+
namespace GitVersion.MsBuild.Task
22
{
33
using Microsoft.Build.Framework;
44

‎src/GitVersionTask.Task/WriteVersionInfoToBuildLog.cs renamed to ‎src/GitVersion.MsBuild.Task/WriteVersionInfoToBuildLog.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersionTask.Task
1+
namespace GitVersion.MsBuild.Task
22
{
33
public class WriteVersionInfoToBuildLog : GitVersionTaskBase
44
{

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
5+
6+
<IsPackable>true</IsPackable>
7+
8+
<NuspecFile>GitVersion.MsBuild.nuspec</NuspecFile>
9+
<NuspecBasePath>bin\$(Configuration)</NuspecBasePath>
10+
<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
11+
<NuspecProperties>version=$(PackageVersion)</NuspecProperties>
12+
13+
<DevelopmentDependency>true</DevelopmentDependency>
14+
</PropertyGroup>
15+
16+
<ItemGroup>
17+
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
18+
</ItemGroup>
19+
20+
<ItemGroup>
21+
<ProjectReference Include="..\GitVersion.MsBuild.Task\GitVersion.MsBuild.Task.csproj" />
22+
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
23+
</ItemGroup>
24+
25+
</Project>

‎src/GitVersionTask/GitVersionTask.nuspec renamed to ‎src/GitVersion.MsBuild/GitVersion.MsBuild.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
4-
<id>GitVersionTask</id>
4+
<id>GitVersion.MsBuild</id>
55
<version>1.0.0</version>
6-
<title>GitVersionTask</title>
6+
<title>GitVersion.MsBuild</title>
77
<authors>GitTools and Contributors</authors>
88
<owners>GitTools and Contributors</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>

‎src/GitVersionTask/GitVersionTasks.cs renamed to ‎src/GitVersion.MsBuild/GitVersionTasks.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
namespace GitVersionTask
1+
namespace GitVersion.MsBuild
22
{
33
using System;
44
using System.IO;
55
using GitVersion;
66
using GitVersion.Helpers;
7-
using GitVersionTask.Task;
7+
using GitVersion.MsBuild.Task;
88
using Microsoft.Build.Framework;
99

1010
public static class GitVersionTasks

‎src/GitVersionTask/InvalidFileChecker.cs renamed to ‎src/GitVersion.MsBuild/InvalidFileChecker.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
using System.Linq;
55
using System.Text.RegularExpressions;
66
using Microsoft.Build.Framework;
7-
using GitVersion;
87

9-
namespace GitVersionTask
8+
namespace GitVersion.MsBuild
109
{
11-
1210
public static class InvalidFileChecker
1311
{
1412
private static readonly Dictionary<string, Func<string, string, bool>> versionAttributeFinders = new Dictionary<string, Func<string, string, bool>>()

‎src/GitVersionTask/TempFileTracker.cs renamed to ‎src/GitVersion.MsBuild/TempFileTracker.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System;
1+
using System;
22
using System.IO;
33

4-
namespace GitVersionTask
4+
namespace GitVersion.MsBuild
55
{
66
public static class TempFileTracker
77
{
@@ -37,4 +37,4 @@ public static void DeleteTempFiles()
3737
}
3838

3939
}
40-
}
40+
}

‎src/GitVersionTask/build/GitVersion.MsBuild.props renamed to ‎src/GitVersion.MsBuild/build/GitVersion.MsBuild.props

File renamed without changes.

‎src/GitVersionTask/build/GitVersion.MsBuild.targets renamed to ‎src/GitVersion.MsBuild/build/GitVersion.MsBuild.targets

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313

1414
<Target Name="UpdateAssemblyInfo" BeforeTargets="CoreCompile" Condition="$(UpdateAssemblyInfo) == 'true'">
1515

16-
<UpdateAssemblyInfo SolutionDirectory="$(GitVersionPath)" NoFetch="$(GitVersion_NoFetchEnabled)" ProjectFile="$(MSBuildProjectFullPath)" IntermediateOutputPath="$(IntermediateOutputPath)" Language="$(Language)"
16+
<UpdateAssemblyInfo
17+
SolutionDirectory="$(GitVersionPath)"
18+
NoFetch="$(GitVersion_NoFetchEnabled)"
19+
ProjectFile="$(MSBuildProjectFullPath)"
20+
IntermediateOutputPath="$(IntermediateOutputPath)"
21+
Language="$(Language)"
1722
CompileFiles ="@(Compile)">
1823

1924
<Output TaskParameter="AssemblyInfoTempFilePath" PropertyName="AssemblyInfoTempFilePath" />
@@ -27,7 +32,12 @@
2732

2833
<Target Name="GenerateGitVersionInformation" BeforeTargets="CoreCompile" Condition="$(GenerateGitVersionInformation) == 'true'">
2934

30-
<GenerateGitVersionInformation SolutionDirectory="$(GitVersionPath)" NoFetch="$(GitVersion_NoFetchEnabled)" ProjectFile="$(MSBuildProjectFullPath)" IntermediateOutputPath="$(IntermediateOutputPath)" Language="$(Language)">
35+
<GenerateGitVersionInformation
36+
SolutionDirectory="$(GitVersionPath)"
37+
NoFetch="$(GitVersion_NoFetchEnabled)"
38+
ProjectFile="$(MSBuildProjectFullPath)"
39+
IntermediateOutputPath="$(IntermediateOutputPath)"
40+
Language="$(Language)">
3141

3242
<Output TaskParameter="GitVersionInformationFilePath" PropertyName="GitVersionInformationFilePath" />
3343
</GenerateGitVersionInformation>

‎src/GitVersionTask/buildMultiTargeting/GitVersion.MsBuild.props renamed to ‎src/GitVersion.MsBuild/buildMultiTargeting/GitVersion.MsBuild.props

File renamed without changes.

‎src/GitVersionTask/buildMultiTargeting/GitVersion.MsBuild.targets renamed to ‎src/GitVersion.MsBuild/buildMultiTargeting/GitVersion.MsBuild.targets

File renamed without changes.

‎src/GitVersionTask/key.snk renamed to ‎src/GitVersion.MsBuild/key.snk

File renamed without changes.

‎src/GitVersion.sln

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 16
33
VisualStudioVersion = 16.0.28714.193
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionExe", "GitVersionExe\GitVersionExe.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
6-
EndProject
7-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask.Tests", "GitVersionTask.Tests\GitVersionTask.Tests.csproj", "{5A86453B-96FB-4B6E-A283-225BB9F753D3}"
8-
EndProject
9-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionCore.Tests", "GitVersionCore.Tests\GitVersionCore.Tests.csproj", "{BF905F84-382C-440D-92F5-C61108626D8D}"
10-
EndProject
115
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EFFC5D6-88D0-49D9-BB53-E1B7EB49DD45}"
126
ProjectSection(SolutionItems) = preProject
137
..\.gitattributes = ..\.gitattributes
@@ -26,15 +20,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2620
..\README.md = ..\README.md
2721
EndProjectSection
2822
EndProject
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionExe", "GitVersionExe\GitVersionExe.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
24+
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionCore.Tests", "GitVersionCore.Tests\GitVersionCore.Tests.csproj", "{BF905F84-382C-440D-92F5-C61108626D8D}"
26+
EndProject
2927
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionCore", "GitVersionCore\GitVersionCore.csproj", "{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}"
3028
EndProject
3129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionExe.Tests", "GitVersionExe.Tests\GitVersionExe.Tests.csproj", "{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}"
3230
EndProject
33-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask", "GitVersionTask\GitVersionTask.csproj", "{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}"
34-
EndProject
3531
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.Tool", "GitVersionExe\GitVersion.Tool.csproj", "{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}"
3632
EndProject
37-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionTask.Task", "GitVersionTask.Task\GitVersionTask.Task.csproj", "{F34414D6-903D-45FB-8F56-4F11A4DB41F1}"
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.MsBuild", "GitVersion.MsBuild\GitVersion.MsBuild.csproj", "{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}"
34+
EndProject
35+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.MsBuild.Task", "GitVersion.MsBuild.Task\GitVersion.MsBuild.Task.csproj", "{F34414D6-903D-45FB-8F56-4F11A4DB41F1}"
36+
EndProject
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.MsBuild.Task.Tests", "GitVersion.MsBuild.Task.Tests\GitVersion.MsBuild.Task.Tests.csproj", "{5A86453B-96FB-4B6E-A283-225BB9F753D3}"
3838
EndProject
3939
Global
4040
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎src/GitVersionTask.Tests/GitVersionTask.Tests.v2.ncrunchproject

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

‎src/GitVersionTask.Tests/Tests.v2.ncrunchproject

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

‎src/GitVersionTask/GitVersionTask.csproj

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

0 commit comments

Comments
 (0)