Skip to content

Commit ddc0c0f

Browse files
committed
cleanup
1 parent 9485b2f commit ddc0c0f

File tree

7 files changed

+16
-223
lines changed

7 files changed

+16
-223
lines changed

AcceptanceTests/AcceptanceTests.csproj

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,24 +85,12 @@
8585
<Compile Include="GitHubFlow\MasterTests.cs" />
8686
<Compile Include="MsBuildProjectArgTest.cs" />
8787
<Compile Include="ApprovalTestsConfig.cs" />
88-
<Compile Include="Properties\Resources.Designer.cs">
89-
<AutoGen>True</AutoGen>
90-
<DesignTime>True</DesignTime>
91-
<DependentUpon>Resources.resx</DependentUpon>
92-
</Compile>
9388
<Compile Include="RepositoryFixtureBase.cs" />
9489
</ItemGroup>
9590
<ItemGroup>
9691
<None Include="packages.config" />
9792
<None Include="TestBuildFile.proj" />
9893
</ItemGroup>
99-
<ItemGroup>
100-
<EmbeddedResource Include="Properties\Resources.resx">
101-
<Generator>ResXFileCodeGenerator</Generator>
102-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
103-
<SubType>Designer</SubType>
104-
</EmbeddedResource>
105-
</ItemGroup>
10694
<ItemGroup>
10795
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj">
10896
<Project>{f9741a0d-b9d7-4557-9a1c-a7252c1071f5}</Project>
@@ -132,11 +120,4 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBin
132120
</PropertyGroup>
133121
<Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
134122
</Target>
135-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
136-
Other similar extension points exist, see Microsoft.Common.targets.
137-
<Target Name="BeforeBuild">
138-
</Target>
139-
<Target Name="AfterBuild">
140-
</Target>
141-
-->
142123
</Project>

AcceptanceTests/ExecCmdLineArgumentTest.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-

2-
namespace GitHubFlowVersion.AcceptanceTests
1+
namespace GitHubFlowVersion.AcceptanceTests
32
{
43
using global::AcceptanceTests;
54
using global::AcceptanceTests.Helpers;
6-
using global::AcceptanceTests.Properties;
75
using System.IO;
86
using Shouldly;
97
using Xunit;
@@ -22,7 +20,13 @@ public void RunExecViaCommandLine()
2220
fixture.Repository.MakeACommit();
2321

2422
var buildFile = Path.Combine(fixture.RepositoryPath, "TestBuildFile.proj");
25-
File.WriteAllBytes(buildFile, Resources.TestBuildFile);
23+
var buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
24+
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
25+
<Target Name=""OutputResults"">
26+
<Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)""/>
27+
</Target>
28+
</Project>";
29+
File.WriteAllText(buildFile, buildFileContent);
2630
var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, MsBuild, "TestBuildFile.proj /target:OutputResults");
2731

2832
result.ExitCode.ShouldBe(0);

AcceptanceTests/MsBuildProjectArgTest.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.IO;
44
using global::AcceptanceTests;
55
using global::AcceptanceTests.Helpers;
6-
using global::AcceptanceTests.Properties;
76
using Shouldly;
87
using Xunit;
98

@@ -18,7 +17,13 @@ public void RunsMsBuildProvideViaCommandLineArg()
1817
fixture.Repository.MakeATaggedCommit(TaggedVersion);
1918

2019
var buildFile = Path.Combine(fixture.RepositoryPath, "TestBuildFile.proj");
21-
File.WriteAllBytes(buildFile, Resources.TestBuildFile);
20+
var buildFileContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
21+
<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
22+
<Target Name=""OutputResults"">
23+
<Message Text=""GitVersion_FullSemVer: $(GitVersion_FullSemVer)""/>
24+
</Target>
25+
</Project>";
26+
File.WriteAllText(buildFile, buildFileContent);
2227
var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, projectFile: "TestBuildFile.proj", projectArgs: "/target:OutputResults");
2328

2429
result.ExitCode.ShouldBe(0);

AcceptanceTests/Properties/Resources.Designer.cs

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

AcceptanceTests/Properties/Resources.resx

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

GitVersionExe/GitVersionExe.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<Compile Include="HelpWriter.cs" />
5757
<Compile Include="ProcessHelper.cs" />
5858
<Compile Include="Program.cs" />
59-
<Compile Include="Properties\AssemblyInfo.cs" />
59+
<Compile Include="AssemblyInfo.cs" />
6060
<Compile Include="AssemblyInfoFileUpdate.cs" />
6161
</ItemGroup>
6262
<ItemGroup>

0 commit comments

Comments
 (0)