Skip to content

Commit 50b1458

Browse files
AArnottAArnott
committed
Merge branch 'buildUpdates'
2 parents a8d1838 + b3e7d83 commit 50b1458

File tree

12 files changed

+90
-132
lines changed

12 files changed

+90
-132
lines changed

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on_success:
3030
- ps: >-
3131
if ($env:NuGetApiKey -and $env:APPVEYOR_REPO_TAG_NAME -match "^v\d") {
3232
Write-Output "Publishing release packages to nuget.org due to pushed tag $env:APPVEYOR_REPO_TAG_NAME"
33-
Get-ChildItem bin\Release\*.nupkg -exclude *.symbols.nupkg |% {
33+
Get-ChildItem bin\Release\Nerdbank.GitVersioning.NuGet\*.nupkg -exclude *.symbols.nupkg |% {
3434
nuget push $_ -ApiKey $env:NuGetApiKey
3535
}
3636
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
<DebugSymbols>true</DebugSymbols>
2020
<DebugType>full</DebugType>
2121
<Optimize>false</Optimize>
22-
<OutputPath>..\..\bin\Debug\</OutputPath>
22+
<OutputPath>bin\Debug\</OutputPath>
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2828
<DebugType>pdbonly</DebugType>
2929
<Optimize>true</Optimize>
30-
<OutputPath>..\..\bin\Release\</OutputPath>
30+
<OutputPath>bin\Release\</OutputPath>
3131
<DefineConstants>TRACE</DefineConstants>
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>

‎src/NerdBank.GitVersioning.Tests/project.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
{
22
"dependencies": {
3-
"LibGit2Sharp": "0.22.0",
43
"Microsoft.CodeAnalysis.CSharp": "1.1.1",
5-
"Nerdbank.GitVersioning": "1.5.46",
6-
"Newtonsoft.Json": "7.0.1",
74
"System.Collections.Immutable": "1.1.37",
8-
"Validation": "2.0.6.15003",
95
"xunit": "2.1.0",
106
"Xunit.Combinatorial": "1.1.12",
117
"xunit.runner.visualstudio": "2.1.0"
128
},
139
"frameworks": {
14-
".NETFramework,Version=v4.5.2": {}
10+
"net452": {}
1511
},
1612
"runtimes": {
1713
"win": {}

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

Lines changed: 5 additions & 29 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.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\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,38 +11,28 @@
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' ">
2017
<DebugSymbols>true</DebugSymbols>
2118
<DebugType>full</DebugType>
2219
<Optimize>false</Optimize>
23-
<OutputPath>..\..\bin\Debug\</OutputPath>
20+
<OutputPath>bin\Debug\</OutputPath>
2421
<DefineConstants>DEBUG;TRACE</DefineConstants>
2522
<ErrorReport>prompt</ErrorReport>
2623
<WarningLevel>4</WarningLevel>
27-
<DocumentationFile>..\..\bin\Debug\Nerdbank.GitVersioning.xml</DocumentationFile>
24+
<DocumentationFile>bin\Debug\Nerdbank.GitVersioning.xml</DocumentationFile>
2825
</PropertyGroup>
2926
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3027
<DebugType>pdbonly</DebugType>
3128
<Optimize>true</Optimize>
32-
<OutputPath>..\..\bin\Release\</OutputPath>
29+
<OutputPath>bin\Release\</OutputPath>
3330
<DefineConstants>TRACE</DefineConstants>
3431
<ErrorReport>prompt</ErrorReport>
3532
<WarningLevel>4</WarningLevel>
36-
<DocumentationFile>..\..\bin\Release\Nerdbank.GitVersioning.xml</DocumentationFile>
33+
<DocumentationFile>bin\Release\Nerdbank.GitVersioning.xml</DocumentationFile>
3734
</PropertyGroup>
3835
<ItemGroup>
39-
<Reference Include="LibGit2Sharp, Version=0.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\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.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"dependencies": {
3+
"LibGit2Sharp": {
4+
"version": "0.22.0",
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+
"ReadOnlySourceTree": {
17+
"version": "0.1.37-beta",
18+
"suppressParent": "none"
19+
},
20+
"Validation": "2.0.6.15003"
21+
},
22+
"frameworks": {
23+
"net45": { }
24+
},
25+
"runtimes": {
26+
"win": { }
27+
}
28+
}

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

Lines changed: 19 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
<ProjectGuid>b7de4122-9e90-43de-be44-454315cfae99</ProjectGuid>
1515
</PropertyGroup>
1616
<PropertyGroup>
17-
<VersionDependsOn>$(VersionDependsOn);GetNuPkgVersion</VersionDependsOn>
18-
<NuProjPath>..\..\packages\NuProj.0.10.30-beta-gcbd7693f91\tools\</NuProjPath>
17+
<NuProjPath>$(UserProfile)\.nuget\packages\NuProj\0.11.14-beta\tools\</NuProjPath>
1918
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
2019
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
2120
<OutDir>..\..\bin\$(Configuration)\</OutDir>
@@ -36,32 +35,9 @@
3635
<Tags>git commit versioning version assemblyinfo</Tags>
3736
<DevelopmentDependency>True</DevelopmentDependency>
3837
<NoPackageAnalysis>true</NoPackageAnalysis>
38+
<NoDefaultExcludes>true</NoDefaultExcludes>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Content Include="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\libgit2\windows\amd64\git2-785d8c4.dll">
42-
<Link>build\NativeBinaries\amd64\git2-785d8c4.dll</Link>
43-
</Content>
44-
<Content Include="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\libgit2\windows\amd64\git2-785d8c4.pdb">
45-
<Link>build\NativeBinaries\amd64\git2-785d8c4.pdb</Link>
46-
</Content>
47-
<Content Include="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\libgit2\windows\x86\git2-785d8c4.dll">
48-
<Link>build\NativeBinaries\x86\git2-785d8c4.dll</Link>
49-
</Content>
50-
<Content Include="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\libgit2\windows\x86\git2-785d8c4.pdb">
51-
<Link>build\NativeBinaries\x86\git2-785d8c4.pdb</Link>
52-
</Content>
53-
<Content Include="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\libgit2\osx\libgit2-785d8c4.dylib">
54-
<Link>build\NativeBinaries\osx\libgit2-785d8c4.dylib</Link>
55-
</Content>
56-
<Content Include="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\libgit2\linux\amd64\libgit2-785d8c4.so">
57-
<Link>build\NativeBinaries\linux\amd64\libgit2-785d8c4.so</Link>
58-
</Content>
59-
<Content Include="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\libgit2\LibGit2Sharp.dll.config">
60-
<Link>build\LibGit2Sharp.dll.config</Link>
61-
</Content>
62-
<Content Include="..\NerdBank.GitVersioning\version.schema.json">
63-
<Link>tools\version.schema.json</Link>
64-
</Content>
6541
<Content Include="buildCrossTargeting\NerdBank.GitVersioning.targets" />
6642
<Content Include="build\dotnet\Nerdbank.GitVersioning.targets" />
6743
<Content Include="build\NerdBank.GitVersioning.targets" />
@@ -72,33 +48,29 @@
7248
<Content Include="tools\Install.ps1" />
7349
<Content Include="readme.txt" />
7450
</ItemGroup>
51+
<ItemGroup>
52+
<None Include="project.json" />
53+
</ItemGroup>
54+
<Target Name="PackageLibGit2SharpNativeBinaries" BeforeTargets="ConvertItems;GetCopyToOutputDirectoryItems">
55+
<ItemGroup>
56+
<!-- Adapt the copy behavior -->
57+
<NoneToContentPort Include="@(None)" Condition=" '%(None.CopyToOutputDirectory)' == 'PreserveNewest' " />
58+
<None Remove="@(NoneToContentPort)" />
59+
<Content Include="@(NoneToContentPort)">
60+
<Link>build\%(NoneToContentPort.Link)</Link>
61+
<CopyToOutputDirectory />
62+
<PackageDirectory>build</PackageDirectory>
63+
</Content>
64+
</ItemGroup>
65+
</Target>
7566
<ItemGroup>
7667
<ProjectReference Include="..\NerdBank.GitVersioning.Tasks\Nerdbank.GitVersioning.Tasks.csproj">
7768
<PackageDirectory>build</PackageDirectory>
7869
</ProjectReference>
7970
</ItemGroup>
80-
<ItemGroup>
81-
<Folder Include="build\NativeBinaries\amd64\" />
82-
<Folder Include="build\NativeBinaries\x86\" />
83-
</ItemGroup>
8471
<Import Project="$(NuProjPath)\NuProj.targets" />
85-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
86-
<PropertyGroup>
87-
<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>
88-
</PropertyGroup>
89-
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.46\build\NerdBank.GitVersioning.targets'))" />
90-
</Target>
91-
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.46\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.46\build\NerdBank.GitVersioning.targets')" />
92-
<Target Name="GetNuPkgVersion" DependsOnTargets="GetBuildVersion">
72+
<Target Name="ExpandForNpmPackage" DependsOnTargets="GenerateNuSpec;PrepareForBuild" AfterTargets="GenerateNuSpec">
9373
<PropertyGroup>
94-
<Version>$(NuGetPackageVersion)</Version>
95-
<NuSpecProperties>$(NuSpecProperties);GitCommitIdShort=$(GitCommitIdShort)</NuSpecProperties>
96-
</PropertyGroup>
97-
</Target>
98-
<Target Name="ExpandForNpmPackage"
99-
DependsOnTargets="GenerateNuSpec;PrepareForBuild"
100-
AfterTargets="GenerateNuSpec">
101-
<PropertyGroup>
10274
<NpmPackageLayoutDir>..\nerdbank-gitversioning.npm\out\nbgv.nuget\</NpmPackageLayoutDir>
10375
</PropertyGroup>
10476
<ItemGroup>
@@ -107,7 +79,6 @@
10779
<TargetPath Condition=" '%(File.TargetPath)' == '' ">$(NpmPackageLayoutDir)%(FileName)%(Extension)</TargetPath>
10880
</NpmPackageLayout>
10981
</ItemGroup>
110-
<Copy SourceFiles="@(NpmPackageLayout)"
111-
DestinationFiles="@(NpmPackageLayout->'%(TargetPath)')" />
82+
<Copy SourceFiles="@(NpmPackageLayout)" DestinationFiles="@(NpmPackageLayout->'%(TargetPath)')" />
11283
</Target>
11384
</Project>

‎src/Nerdbank.GitVersioning.NuGet/build/NerdBank.GitVersioning.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393

9494
<Target Name="SetCloudBuildVersionVars"
9595
DependsOnTargets="GetBuildVersion"
96-
AfterTargets="GetBuildVersion"
9796
Condition=" '@(CloudBuildVersionVars)' != '' ">
9897
<Nerdbank.GitVersioning.Tasks.SetCloudBuildVariables
9998
CloudBuildVersionVars="@(CloudBuildVersionVars)">
@@ -106,7 +105,6 @@
106105

107106
<Target Name="SetCloudBuildNumberWithVersion"
108107
DependsOnTargets="GetBuildVersion"
109-
AfterTargets="GetBuildVersion"
110108
Condition=" '$(CloudBuildNumber)' != '' ">
111109
<Nerdbank.GitVersioning.Tasks.SetCloudBuildVariables
112110
CloudBuildNumber="$(CloudBuildNumber)">

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"frameworks": {
3+
"net451": { }
4+
},
5+
"dependencies": {
6+
"LibGit2Sharp": "0.22.0",
7+
"Nerdbank.GitVersioning": {
8+
"version": "1.5.46",
9+
"suppressParent": "none"
10+
},
11+
"ReadOnlySourceTree": {
12+
"version": "0.1.37-beta",
13+
"suppressParent": "none"
14+
},
15+
"NuProj": "0.11.14-beta"
16+
},
17+
"runtimes": {
18+
"win": { }
19+
}
20+
}

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

Lines changed: 3 additions & 29 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.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\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,42 +12,28 @@
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>
2118
<DebugType>full</DebugType>
2219
<Optimize>false</Optimize>
23-
<OutputPath>..\..\bin\Debug\</OutputPath>
20+
<OutputPath>bin\Debug\</OutputPath>
2421
<DefineConstants>DEBUG;TRACE</DefineConstants>
2522
<ErrorReport>prompt</ErrorReport>
2623
<WarningLevel>4</WarningLevel>
2724
</PropertyGroup>
2825
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2926
<DebugType>pdbonly</DebugType>
3027
<Optimize>true</Optimize>
31-
<OutputPath>..\..\bin\Release\</OutputPath>
28+
<OutputPath>bin\Release\</OutputPath>
3229
<DefineConstants>TRACE</DefineConstants>
3330
<ErrorReport>prompt</ErrorReport>
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.22.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\LibGit2Sharp.0.22.0\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.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.129\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>

0 commit comments

Comments
 (0)