Skip to content

Commit 172bbab

Browse files
SimonCroppSimonCropp
committed
strong name the task
so we dont share versions in the VS appdomain
1 parent 6c004d0 commit 172bbab

File tree

9 files changed

+33
-38
lines changed

9 files changed

+33
-38
lines changed

‎GitVersionCore/Properties/AssemblyInfo.cs renamed to ‎GitVersionCore/AssemblyInfo.cs

File renamed without changes.

‎GitVersionCore/GitVersionCore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>GitVersionCore</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>e4626a5c</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>d883b6ac</NuGetPackageImportStamp>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<DebugSymbols>true</DebugSymbols>
@@ -103,7 +103,7 @@
103103
<Compile Include="OutputType.cs" />
104104
<Compile Include="OutputVariables\CiFeedFormatter.cs" />
105105
<Compile Include="OutputVariables\VariableProvider.cs" />
106-
<Compile Include="Properties\AssemblyInfo.cs" />
106+
<Compile Include="AssemblyInfo.cs" />
107107
<Compile Include="ReleaseDate.cs" />
108108
<Compile Include="ReleaseDateFinder.cs" />
109109
<Compile Include="RepositoryLoader.cs" />
@@ -130,8 +130,8 @@
130130
<PropertyGroup>
131131
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
132132
</PropertyGroup>
133-
<Error Condition="!Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets'))" />
134133
<Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
134+
<Error Condition="!Exists('..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets'))" />
135135
</Target>
136136
<PropertyGroup>
137137
<PostBuildEvent>
@@ -156,6 +156,6 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBin
156156
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.nuspec" DestinationFolder="$(SolutionDir)NuGetRefBuild" />
157157
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetRefBuild" MetadataAssembly="$(OutputPath)GitVersionCore.dll" />
158158
</Target>
159-
<Import Project="..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" />
160159
<Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
160+
<Import Project="..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets')" />
161161
</Project>

‎GitVersionCore/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<package id="Fody" version="1.24.0" targetFramework="net40" developmentDependency="true" />
55
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
66
<package id="LibGit2Sharp" version="0.18.1.0" targetFramework="net40" />
7-
<package id="PepitaPackage" version="1.20.0.0" targetFramework="net40" developmentDependency="true" />
7+
<package id="PepitaPackage" version="1.20.1.0" targetFramework="net40" developmentDependency="true" />
88
<package id="Visualize.Fody" version="0.4.0.0" targetFramework="net40" developmentDependency="true" />
99
</packages>

‎GitVersionExe/GitVersionExe.csproj

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>GitVersion</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>f25e2da3</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>47eff399</NuGetPackageImportStamp>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<DebugSymbols>true</DebugSymbols>
@@ -110,14 +110,12 @@
110110
<Using Namespace="System" />
111111
<Using Namespace="System.IO" />
112112
<Using Namespace="System.Text.RegularExpressions" />
113-
<Code Type="Fragment" Language="cs">
114-
<![CDATA[
113+
<Code Type="Fragment" Language="cs"><![CDATA[
115114
File.WriteAllText(
116115
OutputFilename,
117116
Regex.Replace(File.ReadAllText(InputFilename), MatchExpression, ReplacementText)
118117
);
119-
]]>
120-
</Code>
118+
]]></Code>
121119
</Task>
122120
</UsingTask>
123121
<Target Name="AfterBuild" DependsOnTargets="Clean">
@@ -148,28 +146,19 @@
148146
<GemFiles Include="$(ProjectDir)GemAssets\Gemfile" />
149147
</ItemGroup>
150148
<Copy SourceFiles="@(GemFiles)" DestinationFiles="@(GemFiles->'$(SolutionDir)GemBuild\%(RecursiveDir)%(Filename)%(Extension)')" />
151-
152149
<PropertyGroup>
153150
<GemVersion Condition="'$(GitVersion_PreReleaseTag)' == ''">$(GitVersion_MajorMinorPatch)</GemVersion>
154151
<GemVersion Condition="'$(GitVersion_PreReleaseTag)' != ''">$(GitVersion_MajorMinorPatch).$(GitVersion_PreReleaseTag)</GemVersion>
155152
</PropertyGroup>
156-
157-
<ReplaceFileText
158-
InputFilename="$(SolutionDir)GemBuild\gitversion.gemspec"
159-
OutputFilename="$(SolutionDir)GemBuild\gitversion.gemspec"
160-
MatchExpression="\$version\$"
161-
ReplacementText="$(GemVersion)"
162-
Condition="'$(GitVersion_SemVer)' != ''"/>
163-
164-
<Exec Command="gem build gitversion.gemspec" ContinueOnError="True"
165-
WorkingDirectory="$(SolutionDir)GemBuild" Condition="'$(GitVersion_SemVer)' != ''" />
153+
<ReplaceFileText InputFilename="$(SolutionDir)GemBuild\gitversion.gemspec" OutputFilename="$(SolutionDir)GemBuild\gitversion.gemspec" MatchExpression="\$version\$" ReplacementText="$(GemVersion)" Condition="'$(GitVersion_SemVer)' != ''" />
154+
<Exec Command="gem build gitversion.gemspec" ContinueOnError="True" WorkingDirectory="$(SolutionDir)GemBuild" Condition="'$(GitVersion_SemVer)' != ''" />
166155
</Target>
167156
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
168157
<PropertyGroup>
169158
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
170159
</PropertyGroup>
171-
<Error Condition="!Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets'))" />
172160
<Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
161+
<Error Condition="!Exists('..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets'))" />
173162
</Target>
174163
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
175164
<ParameterGroup>
@@ -207,7 +196,6 @@ foreach (var item in filesToCleanup)
207196
<Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
208197
<CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
209198
</Target>
210-
<Import Project="..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" />
211199
<PropertyGroup>
212200
<PostBuildEvent>
213201
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
@@ -217,4 +205,5 @@ if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\a
217205
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
218206
</PropertyGroup>
219207
<Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
220-
</Project>
208+
<Import Project="..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets')" />
209+
</Project>

‎GitVersionExe/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<package id="Fody" version="1.24.0" targetFramework="net40" developmentDependency="true" />
66
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.18.1.0" targetFramework="net40" />
8-
<package id="PepitaPackage" version="1.20.0.0" targetFramework="net40" developmentDependency="true" />
8+
<package id="PepitaPackage" version="1.20.1.0" targetFramework="net40" developmentDependency="true" />
99
<package id="Visualize.Fody" version="0.4.0.0" targetFramework="net40" developmentDependency="true" />
1010
</packages>

‎GitVersionTask/Properties/AssemblyInfo.cs renamed to ‎GitVersionTask/AssemblyInfo.cs

File renamed without changes.

‎GitVersionTask/GitVersionTask.csproj

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>GitVersionTask</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>ed88a080</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>1ef7c3b1</NuGetPackageImportStamp>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<DebugSymbols>true</DebugSymbols>
@@ -59,7 +59,7 @@
5959
<Compile Include="TempFileTracker.cs" />
6060
<Compile Include="UpdateAssemblyInfo.cs" />
6161
<Compile Include="VersionAndBranchFinder.cs" />
62-
<Compile Include="Properties\AssemblyInfo.cs" />
62+
<Compile Include="AssemblyInfo.cs" />
6363
</ItemGroup>
6464
<ItemGroup>
6565
<None Include="NugetAssets\GitVersionTask.targets">
@@ -89,32 +89,35 @@
8989
<Delete Files="@(FilesToDelete)" />
9090
</Target>
9191
<Target Name="AfterBuild" DependsOnTargets="Clean">
92+
<MakeDir Directories="$(TargetDir)ILMergeTemp\" />
93+
<Exec Command="&quot;$(SolutionDir)tools\ilmerge.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)LibGit2Sharp.dll&quot; /target:library /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /internalize " />
94+
<ItemGroup>
95+
<TempFiles Include="$(TargetDir)ILMergeTemp\*.*" />
96+
</ItemGroup>
9297
<MakeDir Directories="$(SolutionDir)NuGetTaskBuild" />
93-
<CreateItem Include="$(SolutionDir)GitVersionTask\bin\$(ConfigurationName)\NativeBinaries\amd64\*.dll">
98+
<CreateItem Include="$(TargetDir)NativeBinaries\amd64\*.dll">
9499
<Output TaskParameter="Include" ItemName="amd64" />
95100
</CreateItem>
96101
<Copy SourceFiles="@(amd64)" DestinationFolder="$(SolutionDir)NuGetTaskBuild\NativeBinaries\amd64" />
97-
<CreateItem Include="$(SolutionDir)GitVersionTask\bin\$(ConfigurationName)\NativeBinaries\x86\*.dll">
102+
<CreateItem Include="$(TargetDir)NativeBinaries\x86\*.dll">
98103
<Output TaskParameter="Include" ItemName="x86" />
99104
</CreateItem>
100105
<Copy SourceFiles="@(x86)" DestinationFolder="$(SolutionDir)NuGetTaskBuild\NativeBinaries\x86" />
101-
<Copy SourceFiles="$(OutputPath)GitVersionTask.dll" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
102-
<Copy SourceFiles="$(OutputPath)LibGit2Sharp.dll" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
103-
<Copy SourceFiles="$(OutputPath)GitVersionTask.pdb" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
104-
<Copy SourceFiles="$(OutputPath)GitVersionCore.dll" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
105-
<Copy SourceFiles="$(OutputPath)GitVersionCore.pdb" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
106+
<Copy SourceFiles="$(TargetDir)ILMergeTemp\GitVersionTask.dll" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
107+
<Copy SourceFiles="$(TargetDir)ILMergeTemp\GitVersionTask.pdb" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
106108
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.targets" DestinationFolder="$(SolutionDir)NuGetTaskBuild\Build" />
107109
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.nuspec" DestinationFolder="$(SolutionDir)NuGetTaskBuild" />
108-
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetTaskBuild" MetadataAssembly="$(OutputPath)GitVersionTask.dll" />
110+
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetTaskBuild" MetadataAssembly="$(ILMergeTemp)GitVersionTask.dll" />
111+
<Delete Files="@(TempFiles)" />
112+
<RemoveDir Directories="$(TargetDir)ILMergeTemp\" />
109113
</Target>
110114
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
111115
<PropertyGroup>
112116
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
113117
</PropertyGroup>
114-
<Error Condition="!Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets'))" />
115118
<Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
119+
<Error Condition="!Exists('..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets'))" />
116120
</Target>
117-
<Import Project="..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" />
118121
<PropertyGroup>
119122
<PostBuildEvent>
120123
if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries"
@@ -124,4 +127,7 @@ if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\a
124127
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
125128
</PropertyGroup>
126129
<Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
130+
<Target Name="ILMerge" BeforeTargets="AfterCompile">
131+
</Target>
132+
<Import Project="..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.20.1.0\build\PepitaPackage.targets')" />
127133
</Project>

‎GitVersionTask/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
44
<package id="Fody" version="1.24.0" targetFramework="net40" developmentDependency="true" />
55
<package id="LibGit2Sharp" version="0.18.1.0" targetFramework="net40" />
6-
<package id="PepitaPackage" version="1.20.0.0" targetFramework="net40" developmentDependency="true" />
6+
<package id="PepitaPackage" version="1.20.1.0" targetFramework="net40" developmentDependency="true" />
77
</packages>

‎key.snk

596 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)