Skip to content

Commit 757bee0

Browse files
JakeGinnivanJakeGinnivan
committed
Upgraded fody
1 parent 4d01a91 commit 757bee0

File tree

12 files changed

+36
-33
lines changed

12 files changed

+36
-33
lines changed

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
</ProjectReference>
168168
</ItemGroup>
169169
<ItemGroup>
170-
<Content Include="FodyWeavers.xml" />
170+
<None Include="FodyWeavers.xml" />
171171
<Content Include="Approved\JsonVersionBuilderTests.Json.approved.txt" />
172172
<Content Include="Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt" />
173173
<Content Include="Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt" />
@@ -188,8 +188,8 @@
188188
<PropertyGroup>
189189
<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>
190190
</PropertyGroup>
191-
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
192191
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props'))" />
192+
<Error Condition="!Exists('..\packages\Fody.2.0.8\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.8\build\dotnet\Fody.targets'))" />
193193
</Target>
194-
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
194+
<Import Project="..\packages\Fody.2.0.8\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.8\build\dotnet\Fody.targets')" />
195195
</Project>

‎src/GitVersionCore.Tests/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
4-
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
4+
<package id="Fody" version="2.0.8" targetFramework="net45" developmentDependency="true" />
55
<package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net45" />
66
<package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
77
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net45" />
88
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net45" />
9-
<package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net45" developmentDependency="true" />
9+
<package id="ModuleInit.Fody" version="1.6.0" targetFramework="net45" developmentDependency="true" />
1010
<package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
1111
<package id="NUnit" version="3.6.0" targetFramework="net45" />
1212
<package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />

‎src/GitVersionCore/FodyWeavers.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Weavers VerifyAssembly="true">
33
<Caseless />
44
</Weavers>

‎src/GitVersionCore/GitVersionCore.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@
175175
<Compile Include="BuildServers\TravisCI.cs" />
176176
</ItemGroup>
177177
<ItemGroup>
178-
<Content Include="FodyWeavers.xml">
178+
<None Include="FodyWeavers.xml">
179179
<SubType>Designer</SubType>
180-
</Content>
180+
</None>
181181
<EmbeddedResource Include="VersionAssemblyInfoResources\VersionAssemblyInfo.vb" />
182182
<EmbeddedResource Include="VersionAssemblyInfoResources\VersionAssemblyInfo.fs" />
183183
</ItemGroup>
@@ -188,15 +188,14 @@
188188
</None>
189189
<None Include="packages.config" />
190190
</ItemGroup>
191-
<ItemGroup />
192191
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
193192
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
194193
<PropertyGroup>
195194
<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>
196195
</PropertyGroup>
197196
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
198-
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
199197
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props'))" />
198+
<Error Condition="!Exists('..\packages\Fody.2.0.8\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.8\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
200199
</Target>
201200
<PropertyGroup>
202201
<PostBuildEvent>
@@ -219,5 +218,5 @@
219218
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetRefBuild" MetadataAssembly="$(OutputPath)GitVersionCore.dll" Version="$(GitVersion_NuGetVersion)" />
220219
</Target>
221220
<Import Project="..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" />
222-
<Import Project="..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
221+
<Import Project="..\packages\Fody.2.0.8\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.2.0.8\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
223222
</Project>

‎src/GitVersionCore/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
4-
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
3+
<package id="Caseless.Fody" version="1.5.0" targetFramework="net40" developmentDependency="true" />
4+
<package id="Fody" version="2.0.8" targetFramework="net40" developmentDependency="true" />
55
<package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net40" />
66
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net40" />
77
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net40" />

‎src/GitVersionExe/FodyWeavers.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Weavers VerifyAssembly="true" VerifyIgnoreCodes="0x80131869">
33
<Caseless />
44
</Weavers>

‎src/GitVersionExe/GitVersionExe.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\ILRepack.2.0.13\build\ILRepack.props" Condition="Exists('..\packages\ILRepack.2.0.13\build\ILRepack.props')" />
34
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -92,9 +93,9 @@
9293
</ItemGroup>
9394
<ItemGroup>
9495
<Content Include="GemAssets\.gitignore" />
95-
<Content Include="FodyWeavers.xml">
96+
<None Include="FodyWeavers.xml">
9697
<SubType>Designer</SubType>
97-
</Content>
98+
</None>
9899
</ItemGroup>
99100
<ItemGroup>
100101
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj">
@@ -211,9 +212,10 @@
211212
<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>
212213
</PropertyGroup>
213214
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
214-
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
215215
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props'))" />
216+
<Error Condition="!Exists('..\packages\Fody.2.0.8\build\portable-net+sl+win+wpa+wp\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.8\build\portable-net+sl+win+wpa+wp\Fody.targets'))" />
217+
<Error Condition="!Exists('..\packages\ILRepack.2.0.13\build\ILRepack.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.2.0.13\build\ILRepack.props'))" />
216218
</Target>
217219
<Import Project="..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" />
218-
<Import Project="..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
220+
<Import Project="..\packages\Fody.2.0.8\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\packages\Fody.2.0.8\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
219221
</Project>

‎src/GitVersionExe/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
4-
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
3+
<package id="Caseless.Fody" version="1.5.0" targetFramework="net40" developmentDependency="true" />
4+
<package id="Fody" version="2.0.8" targetFramework="net40" developmentDependency="true" />
55
<package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net40" />
6-
<package id="ILRepack" version="2.0.12" targetFramework="net40" />
6+
<package id="ILRepack" version="2.0.13" targetFramework="net40" />
77
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net40" />
88
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net40" />
99
<package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<Content Include="Approved\VisualBasic\AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt" />
158158
<Content Include="Approved\VisualBasic\AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt" />
159159
<Content Include="Approved\VisualBasic\AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt" />
160-
<Content Include="FodyWeavers.xml" />
160+
<None Include="FodyWeavers.xml" />
161161
</ItemGroup>
162162
<ItemGroup>
163163
<ProjectReference Include="..\GitVersionCore.Tests\GitVersionCore.Tests.csproj">
@@ -189,8 +189,8 @@
189189
<PropertyGroup>
190190
<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>
191191
</PropertyGroup>
192-
<Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
193192
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.160\build\LibGit2Sharp.NativeBinaries.props'))" />
193+
<Error Condition="!Exists('..\packages\Fody.2.0.8\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.8\build\dotnet\Fody.targets'))" />
194194
</Target>
195-
<Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
195+
<Import Project="..\packages\Fody.2.0.8\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.8\build\dotnet\Fody.targets')" />
196196
</Project>

‎src/GitVersionTask.Tests/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<package id="ApprovalTests" version="3.0.11" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.11" targetFramework="net45" />
55
<package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
6-
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
6+
<package id="Fody" version="2.0.8" targetFramework="net45" developmentDependency="true" />
77
<package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net45" />
88
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net45" />
99
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net45" />
1010
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
1111
<package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net45" />
1212
<package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net45" />
1313
<package id="Microsoft.CodeAnalysis.VisualBasic" version="1.3.2" targetFramework="net45" />
14-
<package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net45" developmentDependency="true" />
14+
<package id="ModuleInit.Fody" version="1.6.0" targetFramework="net45" developmentDependency="true" />
1515
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
1616
<package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
1717
<package id="NUnit" version="3.6.0" targetFramework="net45" />

0 commit comments

Comments
 (0)