Skip to content

Commit aa12256

Browse files
AArnottAArnott
committed
Switch to project.json all-up
1 parent 1c96771 commit aa12256

File tree

6 files changed

+37
-68
lines changed

6 files changed

+37
-68
lines changed

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

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,8 +11,6 @@
1211
<AssemblyName>Nerdbank.GitVersioning</AssemblyName>
1312
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
15-
<NuGetPackageImportStamp>
16-
</NuGetPackageImportStamp>
1714
<TargetFrameworkProfile />
1815
</PropertyGroup>
1916
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -36,14 +33,6 @@
3633
<DocumentationFile>..\..\bin\Release\Nerdbank.GitVersioning.xml</DocumentationFile>
3734
</PropertyGroup>
3835
<ItemGroup>
39-
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\LibGit2Sharp.0.23.0-pre20160803182831\lib\net40\LibGit2Sharp.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
4736
<Reference Include="System" />
4837
<Reference Include="System.Core" />
4938
<Reference Include="System.Xml.Linq" />
@@ -52,10 +41,6 @@
5241
<Reference Include="System.Data" />
5342
<Reference Include="System.Net.Http" />
5443
<Reference Include="System.Xml" />
55-
<Reference Include="Validation, Version=2.0.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\Validation.2.0.6.15003\lib\portable-net40+sl50+win+wpa81+wp80+Xamarin.iOS10+MonoAndroid10+MonoTouch10\Validation.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
5944
</ItemGroup>
6045
<ItemGroup>
6146
<Compile Include="AssemblyVersionOptionsConverter.cs" />
@@ -75,22 +60,13 @@
7560
<Compile Include="VersionOracle.cs" />
7661
</ItemGroup>
7762
<ItemGroup>
78-
<None Include="packages.config" />
63+
<None Include="project.json" />
7964
<None Include="version.schema.json" />
8065
</ItemGroup>
8166
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
82-
<Import Project="..\..\packages\NuProj.0.10.30-beta-gcbd7693f91\tools\Microsoft.Common.NuProj.targets" Condition=" Exists('..\..\packages\NuProj.0.10.30-beta-gcbd7693f91\tools\Microsoft.Common.NuProj.targets') " />
83-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
84-
<PropertyGroup>
85-
<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>
86-
</PropertyGroup>
87-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets'))" />
88-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props'))" />
89-
</Target>
9067
<ProjectExtensions>
9168
<VisualStudio>
9269
<UserProperties version_1schema_1json__JSONSchema="http://json-schema.org/draft-04/schema" />
9370
</VisualStudio>
9471
</ProjectExtensions>
95-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets')" />
9672
</Project>

‎src/NerdBank.GitVersioning/packages.config‎

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

‎src/NerdBank.GitVersioning/project.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"dependencies": {
3+
"LibGit2Sharp": {
4+
"version": "0.23.0-pre20160803182831",
5+
"suppressParent": "none"
6+
},
7+
"Nerdbank.GitVersioning": {
8+
"version": "1.5.46",
9+
"suppressParent": "none"
10+
},
11+
"Newtonsoft.Json": "7.0.1",
12+
"NuProj.Common": {
13+
"version": "0.11.14-beta",
14+
"suppressParent": "none"
15+
},
16+
"Validation": "2.0.6.15003"
17+
},
18+
"frameworks": {
19+
"net45": { }
20+
},
21+
"runtimes": {
22+
"win": { }
23+
}
24+
}

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

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,8 +12,6 @@
1312
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
1514
<TargetFrameworkProfile />
16-
<NuGetPackageImportStamp>
17-
</NuGetPackageImportStamp>
1815
</PropertyGroup>
1916
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2017
<DebugSymbols>true</DebugSymbols>
@@ -34,21 +31,9 @@
3431
<WarningLevel>4</WarningLevel>
3532
</PropertyGroup>
3633
<ItemGroup>
37-
<Reference Include="CodeGenerationAttributes.Net40, Version=0.1.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\PInvoke.MSCorEE.0.1.286-beta-ge68a656187\lib\net40\CodeGenerationAttributes.Net40.dll</HintPath>
39-
<Private>True</Private>
40-
</Reference>
41-
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\LibGit2Sharp.0.23.0-pre20160803182831\lib\net40\LibGit2Sharp.dll</HintPath>
43-
<Private>True</Private>
44-
</Reference>
4534
<Reference Include="Microsoft.Build.Framework" />
4635
<Reference Include="Microsoft.Build.Tasks.v4.0" />
4736
<Reference Include="Microsoft.Build.Utilities.v4.0" />
48-
<Reference Include="PInvoke.MSCorEE, Version=0.1.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\PInvoke.MSCorEE.0.1.286-beta-ge68a656187\lib\net40\PInvoke.MSCorEE.dll</HintPath>
50-
<Private>True</Private>
51-
</Reference>
5237
<Reference Include="System" />
5338
<Reference Include="System.Core" />
5439
<Reference Include="System.Xml.Linq" />
@@ -66,9 +51,7 @@
6651
<Compile Include="SetCloudBuildVariables.cs" />
6752
</ItemGroup>
6853
<ItemGroup>
69-
<None Include="packages.config">
70-
<SubType>Designer</SubType>
71-
</None>
54+
<None Include="project.json" />
7255
</ItemGroup>
7356
<ItemGroup>
7457
<ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj">
@@ -77,13 +60,4 @@
7760
</ProjectReference>
7861
</ItemGroup>
7962
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
80-
<Import Project="..\..\packages\NuProj.0.10.30-beta-gcbd7693f91\tools\Microsoft.Common.NuProj.targets" Condition=" Exists('..\..\packages\NuProj.0.10.30-beta-gcbd7693f91\tools\Microsoft.Common.NuProj.targets') " />
81-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
82-
<PropertyGroup>
83-
<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>
84-
</PropertyGroup>
85-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets'))" />
86-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.157\build\LibGit2Sharp.NativeBinaries.props'))" />
87-
</Target>
88-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\dotnet\Nerdbank.GitVersioning.targets')" />
8963
</Project>

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

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

‎src/Nerdbank.GitVersioning.Tasks/project.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"dependencies": {
3+
"PInvoke.MSCorEE": "0.1.286-beta-ge68a656187"
4+
},
5+
"frameworks": {
6+
"net45": { }
7+
},
8+
"runtimes": {
9+
"win": { }
10+
}
11+
}

0 commit comments

Comments
 (0)