Skip to content

Commit 43db528

Browse files
SimonCroppSimonCropp
committed
fix IL error with visualize.fody
1 parent f7b096f commit 43db528

17 files changed

+78
-65
lines changed

‎GitVersionCore.Tests/FodyWeavers.xml

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

‎GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 11 additions & 8 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>e51a7a82</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>b7aeafc9</NuGetPackageImportStamp>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
@@ -37,11 +37,14 @@
3737
<ItemGroup>
3838
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
3939
<SpecificVersion>False</SpecificVersion>
40-
<HintPath>..\packages\ApprovalTests.3.0.7\lib\net40\ApprovalTests.dll</HintPath>
40+
<HintPath>..\packages\ApprovalTests.3.0.8\lib\net40\ApprovalTests.dll</HintPath>
4141
</Reference>
4242
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\packages\ApprovalUtilities.3.0.7\lib\net35\ApprovalUtilities.dll</HintPath>
44+
<HintPath>..\packages\ApprovalUtilities.3.0.8\lib\net45\ApprovalUtilities.dll</HintPath>
45+
</Reference>
46+
<Reference Include="ApprovalUtilities.Net45">
47+
<HintPath>..\packages\ApprovalUtilities.3.0.8\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
4548
</Reference>
4649
<Reference Include="FluentDateTime">
4750
<HintPath>..\packages\FluentDateTime.1.11.0\Lib\NET35\FluentDateTime.dll</HintPath>
@@ -54,9 +57,9 @@
5457
<SpecificVersion>False</SpecificVersion>
5558
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
5659
</Reference>
57-
<Reference Include="Shouldly, Version=2.3.1.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
60+
<Reference Include="Shouldly, Version=2.4.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
5861
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\packages\Shouldly.2.3.1\lib\net40\Shouldly.dll</HintPath>
62+
<HintPath>..\packages\Shouldly.2.4.0\lib\net40\Shouldly.dll</HintPath>
6063
</Reference>
6164
<Reference Include="System" />
6265
<Reference Include="System.Core" />
@@ -67,7 +70,7 @@
6770
<Reference Include="System.Xml" />
6871
<Reference Include="YamlDotNet, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
6972
<SpecificVersion>False</SpecificVersion>
70-
<HintPath>..\packages\YamlDotNet.3.5.0\lib\net35\YamlDotNet.dll</HintPath>
73+
<HintPath>..\packages\YamlDotNet.3.5.1\lib\net35\YamlDotNet.dll</HintPath>
7174
</Reference>
7275
</ItemGroup>
7376
<ItemGroup>
@@ -149,12 +152,12 @@
149152
<PostBuildEvent>
150153
</PostBuildEvent>
151154
</PropertyGroup>
152-
<Import Project="..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.4\build\Fody.targets')" />
153155
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
154156
<PropertyGroup>
155157
<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>
156158
</PropertyGroup>
157-
<Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
158159
<Error Condition="!Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props'))" />
160+
<Error Condition="!Exists('..\packages\Fody.1.27.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.27.1\build\Fody.targets'))" />
159161
</Target>
162+
<Import Project="..\packages\Fody.1.27.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.27.1\build\Fody.targets')" />
160163
</Project>

‎GitVersionCore.Tests/packages.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ApprovalTests" version="3.0.7" targetFramework="net45" />
4-
<package id="ApprovalUtilities" version="3.0.7" targetFramework="net45" />
5-
<package id="Fody" version="1.26.4" targetFramework="net45" developmentDependency="true" />
3+
<package id="ApprovalTests" version="3.0.8" targetFramework="net45" />
4+
<package id="ApprovalUtilities" version="3.0.8" targetFramework="net45" />
5+
<package id="FluentDateTime" version="1.11.0" targetFramework="net45" />
6+
<package id="Fody" version="1.27.1" targetFramework="net45" developmentDependency="true" />
67
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net45" />
78
<package id="NUnit" version="2.6.4" targetFramework="net45" />
8-
<package id="Shouldly" version="2.3.1" targetFramework="net45" />
9-
<package id="YamlDotNet" version="3.5.0" targetFramework="net45" />
10-
<package id="FluentDateTime" version="1.11.0" targetFramework="net45" />
9+
<package id="Shouldly" version="2.4.0" targetFramework="net45" />
10+
<package id="YamlDotNet" version="3.5.1" targetFramework="net45" />
1111
</packages>

‎GitVersionCore/FodyWeavers.xml

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

‎GitVersionCore/GitVersionCore.csproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AssemblyName>GitVersionCore</AssemblyName>
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15-
<NuGetPackageImportStamp>c31ea180</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp>9b2466c8</NuGetPackageImportStamp>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1818
<DebugSymbols>true</DebugSymbols>
@@ -50,13 +50,13 @@
5050
<Reference Include="Microsoft.CSharp" />
5151
<Reference Include="System.Data" />
5252
<Reference Include="System.Xml" />
53-
<Reference Include="Visualize, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<Reference Include="Visualize, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
5454
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\Packages\Visualize.Fody.0.4.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
55+
<HintPath>..\packages\Visualize.Fody.0.4.1.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
5656
</Reference>
5757
<Reference Include="YamlDotNet, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
5858
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>..\packages\YamlDotNet.3.5.0\lib\net35\YamlDotNet.dll</HintPath>
59+
<HintPath>..\packages\YamlDotNet.3.5.1\lib\net35\YamlDotNet.dll</HintPath>
6060
</Reference>
6161
</ItemGroup>
6262
<ItemGroup>
@@ -127,7 +127,9 @@
127127
<Compile Include="SemanticVersionPreReleaseTag.cs" />
128128
</ItemGroup>
129129
<ItemGroup>
130-
<Content Include="FodyWeavers.xml" />
130+
<Content Include="FodyWeavers.xml">
131+
<SubType>Designer</SubType>
132+
</Content>
131133
</ItemGroup>
132134
<ItemGroup>
133135
<None Include="NugetAssets\GitVersion.nuspec">
@@ -142,8 +144,8 @@
142144
<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>
143145
</PropertyGroup>
144146
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
145-
<Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
146147
<Error Condition="!Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props'))" />
148+
<Error Condition="!Exists('..\packages\Fody.1.27.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.27.1\build\Fody.targets'))" />
147149
</Target>
148150
<PropertyGroup>
149151
<PostBuildEvent>
@@ -165,5 +167,5 @@
165167
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetRefBuild" MetadataAssembly="$(OutputPath)GitVersionCore.dll" Version="$(GitVersion_NuGetVersion)" />
166168
</Target>
167169
<Import Project="..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" />
168-
<Import Project="..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.4\build\Fody.targets')" />
170+
<Import Project="..\packages\Fody.1.27.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.27.1\build\Fody.targets')" />
169171
</Project>

‎GitVersionCore/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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.26.4" targetFramework="net40" developmentDependency="true" />
4+
<package id="Fody" version="1.27.1" targetFramework="net40" developmentDependency="true" />
55
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
66
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net40" />
77
<package id="PepitaPackage" version="1.21.4" targetFramework="net40" developmentDependency="true" />
8-
<package id="Visualize.Fody" version="0.4.0.0" targetFramework="net40" developmentDependency="true" />
9-
<package id="YamlDotNet" version="3.5.0" targetFramework="net40" />
8+
<package id="Visualize.Fody" version="0.4.1.0" targetFramework="net40" developmentDependency="true" />
9+
<package id="YamlDotNet" version="3.5.1" targetFramework="net40" />
1010
</packages>

‎GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,16 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="ApprovalTests">
34-
<HintPath>..\packages\ApprovalTests.3.0.7\lib\net40\ApprovalTests.dll</HintPath>
33+
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
34+
<SpecificVersion>False</SpecificVersion>
35+
<HintPath>..\packages\ApprovalTests.3.0.8\lib\net40\ApprovalTests.dll</HintPath>
36+
</Reference>
37+
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
38+
<SpecificVersion>False</SpecificVersion>
39+
<HintPath>..\packages\ApprovalUtilities.3.0.8\lib\net45\ApprovalUtilities.dll</HintPath>
3540
</Reference>
36-
<Reference Include="ApprovalUtilities">
37-
<HintPath>..\packages\ApprovalUtilities.3.0.7\lib\net35\ApprovalUtilities.dll</HintPath>
41+
<Reference Include="ApprovalUtilities.Net45">
42+
<HintPath>..\packages\ApprovalUtilities.3.0.8\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
3843
</Reference>
3944
<Reference Include="LibGit2Sharp, Version=0.20.1.0, Culture=neutral, processorArchitecture=MSIL">
4045
<SpecificVersion>False</SpecificVersion>
@@ -48,9 +53,9 @@
4853
<SpecificVersion>False</SpecificVersion>
4954
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
5055
</Reference>
51-
<Reference Include="Shouldly, Version=2.3.1.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
56+
<Reference Include="Shouldly, Version=2.4.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
5257
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\packages\Shouldly.2.3.1\lib\net40\Shouldly.dll</HintPath>
58+
<HintPath>..\packages\Shouldly.2.4.0\lib\net40\Shouldly.dll</HintPath>
5459
</Reference>
5560
<Reference Include="System" />
5661
<Reference Include="System.Core" />

‎GitVersionExe.Tests/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="ApprovalTests" version="3.0.7" targetFramework="net45" />
4-
<package id="ApprovalUtilities" version="3.0.7" targetFramework="net45" />
3+
<package id="ApprovalTests" version="3.0.8" targetFramework="net45" />
4+
<package id="ApprovalUtilities" version="3.0.8" targetFramework="net45" />
55
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net45" />
66
<package id="NSubstitute" version="1.8.1.0" targetFramework="net45" />
77
<package id="NUnit" version="2.6.4" targetFramework="net45" />
8-
<package id="Shouldly" version="2.3.1" targetFramework="net45" />
8+
<package id="Shouldly" version="2.4.0" targetFramework="net45" />
99
</packages>

‎GitVersionExe/FodyWeavers.xml

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"?>
2-
<Weavers>
2+
<Weavers >
33
<Caseless/>
44
<JetBrainsAnnotations/>
5-
<Visualize/>
65
<Costura/>
6+
<Visualize/>
77
</Weavers>

‎GitVersionExe/GitVersionExe.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<AssemblyName>GitVersion</AssemblyName>
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15-
<NuGetPackageImportStamp>99f39909</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp>d36a0ee3</NuGetPackageImportStamp>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1818
<DebugSymbols>true</DebugSymbols>
@@ -49,7 +49,7 @@
4949
<Reference Include="System.Xml" />
5050
<Reference Include="System.Xml.Linq" />
5151
<Reference Include="Visualize">
52-
<HintPath>..\packages\Visualize.Fody.0.4.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
52+
<HintPath>..\packages\Visualize.Fody.0.4.1.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
5353
</Reference>
5454
</ItemGroup>
5555
<ItemGroup>
@@ -170,8 +170,8 @@
170170
<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>
171171
</PropertyGroup>
172172
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
173-
<Error Condition="!Exists('..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.26.4\build\Fody.targets'))" />
174173
<Error Condition="!Exists('..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.0.20.1.0\build\net40\LibGit2Sharp.props'))" />
174+
<Error Condition="!Exists('..\packages\Fody.1.27.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.27.1\build\Fody.targets'))" />
175175
</Target>
176176
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
177177
<ParameterGroup>
@@ -214,5 +214,5 @@ foreach (var item in filesToCleanup)
214214
</PostBuildEvent>
215215
</PropertyGroup>
216216
<Import Project="..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" />
217-
<Import Project="..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\packages\Fody.1.26.4\build\Fody.targets')" />
217+
<Import Project="..\packages\Fody.1.27.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.27.1\build\Fody.targets')" />
218218
</Project>

‎GitVersionExe/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<packages>
33
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
44
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
5-
<package id="Fody" version="1.26.4" targetFramework="net40" developmentDependency="true" />
5+
<package id="Fody" version="1.27.1" targetFramework="net40" developmentDependency="true" />
66
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net40" />
88
<package id="PepitaPackage" version="1.21.4" targetFramework="net40" developmentDependency="true" />
9-
<package id="Visualize.Fody" version="0.4.0.0" targetFramework="net40" developmentDependency="true" />
9+
<package id="Visualize.Fody" version="0.4.1.0" targetFramework="net40" developmentDependency="true" />
1010
</packages>

‎GitVersionTask.Tests/FodyWeavers.xml

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

0 commit comments

Comments
 (0)