Skip to content

Commit 390c6ab

Browse files
SimonCroppSimonCropp
committed
update fody
1 parent 96060dc commit 390c6ab

File tree

12 files changed

+23
-23
lines changed

12 files changed

+23
-23
lines changed

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

Lines changed: 3 additions & 3 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>347f25de</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>9300b3f1</NuGetPackageImportStamp>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
@@ -182,7 +182,7 @@
182182
<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>
183183
</PropertyGroup>
184184
<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'))" />
185-
<Error Condition="!Exists('..\packages\Fody.1.28.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.28.1\build\Fody.targets'))" />
185+
<Error Condition="!Exists('..\packages\Fody.1.29.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.0\build\Fody.targets'))" />
186186
</Target>
187-
<Import Project="..\packages\Fody.1.28.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.28.1\build\Fody.targets')" />
187+
<Import Project="..\packages\Fody.1.29.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.29.0\build\Fody.targets')" />
188188
</Project>

‎src/GitVersionCore.Tests/IntegrationTests/MasterScenarios.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void CanSpecifyTagPrefixesAsRegex()
152152
{
153153
using (var fixture = new EmptyRepositoryFixture(new Config { TagPrefix = "version-|[vV]" }))
154154
{
155-
string TaggedVersion = "v1.0.3";
155+
var TaggedVersion = "v1.0.3";
156156
fixture.Repository.MakeATaggedCommit(TaggedVersion);
157157
fixture.Repository.MakeCommits(5);
158158

@@ -171,7 +171,7 @@ public void AreTagsNotAdheringToTagPrefixIgnored()
171171
{
172172
using (var fixture = new EmptyRepositoryFixture(new Config { TagPrefix = "" }))
173173
{
174-
string TaggedVersion = "version-1.0.3";
174+
var TaggedVersion = "version-1.0.3";
175175
fixture.Repository.MakeATaggedCommit(TaggedVersion);
176176
fixture.Repository.MakeCommits(5);
177177

‎src/GitVersionCore.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.8" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.8" targetFramework="net45" />
55
<package id="FluentDateTime" version="1.11.0" targetFramework="net45" />
6-
<package id="Fody" version="1.28.1" targetFramework="net45" developmentDependency="true" />
6+
<package id="Fody" version="1.29.0" targetFramework="net45" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net45" />
88
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
99
<package id="NUnit" version="2.6.4" targetFramework="net45" />

‎src/GitVersionCore/GitVersionCore.csproj

Lines changed: 3 additions & 3 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>0e09d4de</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp>536f6846</NuGetPackageImportStamp>
1616
<BuildDir>$(SolutionDir)..\build\</BuildDir>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -171,7 +171,7 @@
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'))" />
173173
<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.28.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.28.1\build\Fody.targets'))" />
174+
<Error Condition="!Exists('..\packages\Fody.1.29.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.0\build\Fody.targets'))" />
175175
</Target>
176176
<PropertyGroup>
177177
<PostBuildEvent>
@@ -193,5 +193,5 @@
193193
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetRefBuild" MetadataAssembly="$(OutputPath)GitVersionCore.dll" Version="$(GitVersion_NuGetVersion)" />
194194
</Target>
195195
<Import Project="..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" />
196-
<Import Project="..\packages\Fody.1.28.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.28.1\build\Fody.targets')" />
196+
<Import Project="..\packages\Fody.1.29.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.29.0\build\Fody.targets')" />
197197
</Project>

‎src/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.28.1" targetFramework="net40" developmentDependency="true" />
4+
<package id="Fody" version="1.29.0" 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" />

‎src/GitVersionExe/GitVersionExe.csproj

Lines changed: 3 additions & 3 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>78a850d9</NuGetPackageImportStamp>
15+
<NuGetPackageImportStamp>10f65802</NuGetPackageImportStamp>
1616
<BuildDir>$(SolutionDir)..\build\</BuildDir>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -172,7 +172,7 @@
172172
</PropertyGroup>
173173
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
174174
<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'))" />
175-
<Error Condition="!Exists('..\packages\Fody.1.28.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.28.1\build\Fody.targets'))" />
175+
<Error Condition="!Exists('..\packages\Fody.1.29.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.0\build\Fody.targets'))" />
176176
</Target>
177177
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
178178
<ParameterGroup>
@@ -215,5 +215,5 @@ foreach (var item in filesToCleanup)
215215
</PostBuildEvent>
216216
</PropertyGroup>
217217
<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.28.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.28.1\build\Fody.targets')" />
218+
<Import Project="..\packages\Fody.1.29.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.29.0\build\Fody.targets')" />
219219
</Project>

‎src/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.3.3.0" targetFramework="net40" developmentDependency="true" />
5-
<package id="Fody" version="1.28.1" targetFramework="net40" developmentDependency="true" />
5+
<package id="Fody" version="1.29.0" 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" />

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

Lines changed: 3 additions & 3 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>ffe2fefc</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>5f575a66</NuGetPackageImportStamp>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
@@ -236,11 +236,11 @@
236236
<PostBuildEvent>
237237
</PostBuildEvent>
238238
</PropertyGroup>
239-
<Import Project="..\packages\Fody.1.28.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.28.1\build\Fody.targets')" />
239+
<Import Project="..\packages\Fody.1.29.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.29.0\build\Fody.targets')" />
240240
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
241241
<PropertyGroup>
242242
<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>
243243
</PropertyGroup>
244-
<Error Condition="!Exists('..\packages\Fody.1.28.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.28.1\build\Fody.targets'))" />
244+
<Error Condition="!Exists('..\packages\Fody.1.29.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.0\build\Fody.targets'))" />
245245
</Target>
246246
</Project>

‎src/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.8" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.8" targetFramework="net45" />
55
<package id="FluentDateTime" version="1.11.0" targetFramework="net45" />
6-
<package id="Fody" version="1.28.1" targetFramework="net45" developmentDependency="true" />
6+
<package id="Fody" version="1.29.0" targetFramework="net45" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net45" />
88
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0.0-beta2" targetFramework="net45" />
99
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0.0-beta2" targetFramework="net45" />

‎src/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>8cf29f6f</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>99c0dd56</NuGetPackageImportStamp>
1515
<BuildDir>$(SolutionDir)..\build\</BuildDir>
1616
</PropertyGroup>
1717
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -126,7 +126,7 @@
126126
<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>
127127
</PropertyGroup>
128128
<Error Condition="!Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets'))" />
129-
<Error Condition="!Exists('..\packages\Fody.1.28.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.28.1\build\Fody.targets'))" />
129+
<Error Condition="!Exists('..\packages\Fody.1.29.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.0\build\Fody.targets'))" />
130130
</Target>
131131
<PropertyGroup>
132132
<PostBuildEvent>
@@ -135,5 +135,5 @@
135135
<Target Name="ILMerge" BeforeTargets="AfterCompile">
136136
</Target>
137137
<Import Project="..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.21.4\build\PepitaPackage.targets')" />
138-
<Import Project="..\packages\Fody.1.28.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.28.1\build\Fody.targets')" />
138+
<Import Project="..\packages\Fody.1.29.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.29.0\build\Fody.targets')" />
139139
</Project>

‎src/GitVersionTask/InvalidFileChecker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static bool FileContainsVersionAttribute(string compileFile, string projectFile)
2626
var strings = @"""((\\[^\n]|[^""\n])*)""";
2727
var verbatimStrings = @"@(""[^""]*"")+";
2828

29-
string noCommentsOrStrings = Regex.Replace(allText,
29+
var noCommentsOrStrings = Regex.Replace(allText,
3030
blockComments + "|" + lineComments + "|" + strings + "|" + verbatimStrings,
3131
me =>
3232
{

‎src/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.28.1" targetFramework="net40" developmentDependency="true" />
4+
<package id="Fody" version="1.29.0" targetFramework="net40" developmentDependency="true" />
55
<package id="LibGit2Sharp" version="0.20.1.0" targetFramework="net40" />
66
<package id="PepitaPackage" version="1.21.4" targetFramework="net40" developmentDependency="true" />
77
<package id="YamlDotNet" version="3.5.1" targetFramework="net40" />

0 commit comments

Comments
 (0)