Skip to content

Commit 9a93b11

Browse files
JakeGinnivanJakeGinnivan
committed
Merge pull request #318 from JakeGinnivan/FodyUpgrade
Upgrade fody
2 parents 12359cc + 525789c commit 9a93b11

File tree

12 files changed

+23
-24
lines changed

12 files changed

+23
-24
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,4 @@ Desktop.ini
8383

8484
_NCrunch_GitVersion
8585
NuGetCommandLineBuild/
86+
GitVersion.sln.ide/

‎GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15-
<NuGetPackageImportStamp>c2203629</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp>1123b588</NuGetPackageImportStamp>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1818
<DebugSymbols>true</DebugSymbols>
@@ -116,11 +116,11 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBin
116116
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
117117
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
118118
</PropertyGroup>
119-
<Import Project="..\packages\Fody.1.25.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.25.0\build\Fody.targets')" />
119+
<Import Project="..\packages\Fody.1.26.2\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.2\build\Fody.targets')" />
120120
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
121121
<PropertyGroup>
122-
<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>
122+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
123123
</PropertyGroup>
124-
<Error Condition="!Exists('..\packages\Fody.1.25.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.25.0\build\Fody.targets'))" />
124+
<Error Condition="!Exists('..\packages\Fody.1.26.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.2\build\Fody.targets'))" />
125125
</Target>
126126
</Project>

‎GitVersionCore.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="ApprovalTests" version="3.0.7" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.7" targetFramework="net45" />
5-
<package id="Fody" version="1.25.0" targetFramework="net45" developmentDependency="true" />
5+
<package id="Fody" version="1.26.2" targetFramework="net45" developmentDependency="true" />
66
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net45" />
77
<package id="NUnit" version="2.6.3" targetFramework="net45" />
88
<package id="Shouldly" version="2.2.0" targetFramework="net45" />

‎GitVersionCore/GitVersionCore.csproj

Lines changed: 3 additions & 3 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>1359e437</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>17b2068e</NuGetPackageImportStamp>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<DebugSymbols>true</DebugSymbols>
@@ -135,7 +135,7 @@
135135
<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>
136136
</PropertyGroup>
137137
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets'))" />
138-
<Error Condition="!Exists('..\packages\Fody.1.25.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.25.0\build\Fody.targets'))" />
138+
<Error Condition="!Exists('..\packages\Fody.1.26.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.2\build\Fody.targets'))" />
139139
</Target>
140140
<PropertyGroup>
141141
<PostBuildEvent>
@@ -161,5 +161,5 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBin
161161
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetRefBuild" MetadataAssembly="$(OutputPath)GitVersionCore.dll" />
162162
</Target>
163163
<Import Project="..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets')" />
164-
<Import Project="..\packages\Fody.1.25.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.25.0\build\Fody.targets')" />
164+
<Import Project="..\packages\Fody.1.26.2\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.2\build\Fody.targets')" />
165165
</Project>

‎GitVersionCore/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
4-
<package id="Fody" version="1.25.0" targetFramework="net40" developmentDependency="true" />
4+
<package id="Fody" version="1.26.2" targetFramework="net40" developmentDependency="true" />
55
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
66
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net40" />
77
<package id="PepitaPackage" version="1.21.3" targetFramework="net40" developmentDependency="true" />

‎GitVersionExe/GitVersionExe.csproj

Lines changed: 3 additions & 3 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>5d287010</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>32f72d4e</NuGetPackageImportStamp>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<DebugSymbols>true</DebugSymbols>
@@ -172,7 +172,7 @@
172172
<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>
173173
</PropertyGroup>
174174
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets'))" />
175-
<Error Condition="!Exists('..\packages\Fody.1.25.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.25.0\build\Fody.targets'))" />
175+
<Error Condition="!Exists('..\packages\Fody.1.26.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.2\build\Fody.targets'))" />
176176
</Target>
177177
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
178178
<ParameterGroup>
@@ -219,5 +219,5 @@ if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\a
219219
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
220220
</PropertyGroup>
221221
<Import Project="..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets')" />
222-
<Import Project="..\packages\Fody.1.25.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.25.0\build\Fody.targets')" />
222+
<Import Project="..\packages\Fody.1.26.2\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.2\build\Fody.targets')" />
223223
</Project>

‎GitVersionExe/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
44
<package id="Costura.Fody" version="1.1.0.0" targetFramework="net40" developmentDependency="true" />
5-
<package id="Fody" version="1.25.0" targetFramework="net40" developmentDependency="true" />
5+
<package id="Fody" version="1.26.2" targetFramework="net40" developmentDependency="true" />
66
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net40" />
88
<package id="PepitaPackage" version="1.21.3" targetFramework="net40" developmentDependency="true" />

‎GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
16-
<NuGetPackageImportStamp>7a13d6bc</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>48585dbe</NuGetPackageImportStamp>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
@@ -253,11 +253,11 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBin
253253
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
254254
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
255255
</PropertyGroup>
256-
<Import Project="..\packages\Fody.1.25.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.25.0\build\Fody.targets')" />
256+
<Import Project="..\packages\Fody.1.26.2\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.2\build\Fody.targets')" />
257257
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
258258
<PropertyGroup>
259-
<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>
259+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
260260
</PropertyGroup>
261-
<Error Condition="!Exists('..\packages\Fody.1.25.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.25.0\build\Fody.targets'))" />
261+
<Error Condition="!Exists('..\packages\Fody.1.26.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.2\build\Fody.targets'))" />
262262
</Target>
263263
</Project>

‎GitVersionTask.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="ApprovalTests" version="3.0.7" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.7" targetFramework="net45" />
55
<package id="FluentDateTime" version="1.11.0" targetFramework="net45" />
6-
<package id="Fody" version="1.25.0" targetFramework="net45" developmentDependency="true" />
6+
<package id="Fody" version="1.26.2" targetFramework="net45" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net45" />
88
<package id="Microsoft.Web.Xdt" version="1.0.0" targetFramework="net40" />
99
<package id="ModuleInit.Fody" version="1.5.6.0" targetFramework="net45" developmentDependency="true" />

‎GitVersionTask/GitVersionTask.csproj

Lines changed: 3 additions & 3 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>a6227ddc</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>a4bc02b5</NuGetPackageImportStamp>
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1717
<DebugSymbols>true</DebugSymbols>
@@ -123,7 +123,7 @@
123123
<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>
124124
</PropertyGroup>
125125
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets'))" />
126-
<Error Condition="!Exists('..\packages\Fody.1.25.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.25.0\build\Fody.targets'))" />
126+
<Error Condition="!Exists('..\packages\Fody.1.26.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.2\build\Fody.targets'))" />
127127
</Target>
128128
<PropertyGroup>
129129
<PostBuildEvent>
@@ -136,5 +136,5 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBin
136136
<Target Name="ILMerge" BeforeTargets="AfterCompile">
137137
</Target>
138138
<Import Project="..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.3\build\PepitaPackage.targets')" />
139-
<Import Project="..\packages\Fody.1.25.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.25.0\build\Fody.targets')" />
139+
<Import Project="..\packages\Fody.1.26.2\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.2\build\Fody.targets')" />
140140
</Project>

‎GitVersionTask/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
4-
<package id="Fody" version="1.25.0" targetFramework="net40" developmentDependency="true" />
4+
<package id="Fody" version="1.26.2" targetFramework="net40" developmentDependency="true" />
55
<package id="LibGit2Sharp" version="0.19.0.0" targetFramework="net40" />
66
<package id="PepitaPackage" version="1.21.3" targetFramework="net40" developmentDependency="true" />
77
<package id="YamlDotNet" version="3.3.0" targetFramework="net40" />

‎Packages/repositories.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<repositories>
3-
<repository path="..\AcceptanceTests\packages.config" />
43
<repository path="..\GitVersionCore.Tests\packages.config" />
54
<repository path="..\GitVersionCore\packages.config" />
65
<repository path="..\GitVersionExe.Tests\packages.config" />
76
<repository path="..\GitVersionExe\packages.config" />
87
<repository path="..\GitVersionTask.Tests\packages.config" />
98
<repository path="..\GitVersionTask\packages.config" />
10-
<repository path="..\Tests\packages.config" />
119
</repositories>

0 commit comments

Comments
 (0)