Skip to content

Commit abf25bd

Browse files
AArnottAArnott
committed
Update from 1.1.2-rc to 1.1.47-rc-g58708fcf8c
1 parent 58708fc commit abf25bd

File tree

10 files changed

+13
-14
lines changed

10 files changed

+13
-14
lines changed

‎src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@
109109
<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>
110110
</PropertyGroup>
111111
<Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
112-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets'))" />
113112
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props'))" />
114113
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.1\build\net20\xunit.runner.visualstudio.props'))" />
114+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets'))" />
115115
</Target>
116-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets')" />
116+
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets')" />
117117
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
118118
Other similar extension points exist, see Microsoft.Common.targets.
119119
<Target Name="BeforeBuild">

‎src/NerdBank.GitVersioning.Tests/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="LibGit2Sharp" version="0.21.0.176" targetFramework="net452" />
4-
<package id="Nerdbank.GitVersioning" version="1.1.2-rc" targetFramework="net452" developmentDependency="true" />
4+
<package id="Nerdbank.GitVersioning" version="1.1.47-rc-g58708fcf8c" targetFramework="net452" developmentDependency="true" />
55
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
66
<package id="Validation" version="2.0.6.15003" targetFramework="net452" />
77
<package id="xunit" version="2.0.0" targetFramework="net452" />

‎src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@
7676
<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>
7777
</PropertyGroup>
7878
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props'))" />
79-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets'))" />
79+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets'))" />
8080
</Target>
81-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets')" />
8281
<ProjectExtensions>
8382
<VisualStudio>
8483
<UserProperties version_1schema_1json__JSONSchema="http://json-schema.org/draft-04/schema" />
8584
</VisualStudio>
8685
</ProjectExtensions>
86+
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets')" />
8787
</Project>

‎src/NerdBank.GitVersioning/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="LibGit2Sharp" version="0.21.0.176" targetFramework="net452" />
4-
<package id="Nerdbank.GitVersioning" version="1.1.2-rc" targetFramework="net452" developmentDependency="true" />
4+
<package id="Nerdbank.GitVersioning" version="1.1.47-rc-g58708fcf8c" targetFramework="net45" developmentDependency="true" />
55
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
66
<package id="Validation" version="2.0.6.15003" targetFramework="net452" />
77
</packages>

‎src/Nerdbank.GitVersioning.NuGet/Nerdbank.GitVersioning.NuGet.nuproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
<PropertyGroup>
7575
<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>
7676
</PropertyGroup>
77-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets'))" />
77+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\NerdBank.GitVersioning.targets'))" />
7878
</Target>
79-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets')" />
79+
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\NerdBank.GitVersioning.targets')" />
8080
<Target Name="GetNuPkgVersion" DependsOnTargets="GetBuildVersion">
8181
<PropertyGroup>
8282
<Version>$(NuGetPackageVersion)</Version>

‎src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<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>
7474
</PropertyGroup>
7575
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.0.21.0.176\build\net40\LibGit2Sharp.props'))" />
76-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets'))" />
76+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets'))" />
7777
</Target>
78-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.2-rc\build\NerdBank.GitVersioning.targets')" />
78+
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.1.47-rc-g58708fcf8c\build\dotnet\Nerdbank.GitVersioning.targets')" />
7979
</Project>

‎src/Nerdbank.GitVersioning.Tasks/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="LibGit2Sharp" version="0.21.0.176" targetFramework="net45" developmentDependency="true" />
44
<package id="MSBuildTasks" version="1.4.0.88" targetFramework="net452" developmentDependency="true" />
5-
<package id="Nerdbank.GitVersioning" version="1.1.2-rc" targetFramework="net452" developmentDependency="true" />
5+
<package id="Nerdbank.GitVersioning" version="1.1.47-rc-g58708fcf8c" targetFramework="net45" developmentDependency="true" />
66
<package id="NuProj" version="0.10.4-beta-gf7fc34e7d8" targetFramework="net45" developmentDependency="true" />
77
</packages>

‎src/Nerdbank.GitVersioning.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
ProjectSection(SolutionItems) = preProject
1212
..\nuget.config = ..\nuget.config
1313
..\readme.md = ..\readme.md
14-
..\version.txt = ..\version.txt
14+
..\version.json = ..\version.json
1515
EndProjectSection
1616
EndProject
1717
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NerdBank.GitVersioning", "NerdBank.GitVersioning\NerdBank.GitVersioning.csproj", "{50D7B410-D986-499A-9FD1-FBBB55B095BD}"

‎version.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "version": "1.1.0-rc" }

‎version.txt‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)