Skip to content

Commit 8156b62

Browse files
committed
Build .NET Standard 2.0 assembly.
Remove seperate build script.
1 parent e443594 commit 8156b62

File tree

4 files changed

+20
-30
lines changed

4 files changed

+20
-30
lines changed

build/build.cmd

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

build/build.proj

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="14.0" DefaultTargets="Clean;Build;Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<UsingTask TaskName="Zip" AssemblyFile="$(MSBuildThisFileDirectory)target\nuget\packages\$(MSBuildTasksPackageId).$(MSBuildTasksPackageVersion)\tools\MSBuild.Community.Tasks.dll"/>
44
<PropertyGroup>
55
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
@@ -11,17 +11,18 @@
1111
<ItemGroup>
1212
<VisualStudioVersion Include="2012">
1313
<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2012.sln</SolutionFile>
14-
<MSBuildToolsVersion>14.0</MSBuildToolsVersion>
15-
<NuGetPackageRestore>true</NuGetPackageRestore>
14+
<ToolsVersion>14.0</ToolsVersion>
15+
<VisualStudioVersion>14.0</VisualStudioVersion>
1616
</VisualStudioVersion>
1717
<VisualStudioVersion Include="2015">
1818
<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2015.sln</SolutionFile>
19-
<MSBuildToolsVersion>14.0</MSBuildToolsVersion>
20-
<NuGetPackageRestore>true</NuGetPackageRestore>
19+
<ToolsVersion>14.0</ToolsVersion>
20+
<VisualStudioVersion>14.0</VisualStudioVersion>
2121
</VisualStudioVersion>
2222
<VisualStudioVersion Include="2017">
2323
<SolutionFile>$(MSBuildThisFileDirectory)..\src\Renci.SshNet.VS2017.sln</SolutionFile>
24-
<MSBuildToolsVersion>15.0</MSBuildToolsVersion>
24+
<ToolsVersion>15.0</ToolsVersion>
25+
<VisualStudioVersion>15.0</VisualStudioVersion>
2526
</VisualStudioVersion>
2627
</ItemGroup>
2728
<ItemGroup>
@@ -62,15 +63,18 @@
6263
<Moniker>uap10</Moniker>
6364
</TargetFramework>
6465
</ItemGroup>
65-
<Target Name="Clean">
66+
<Target Name="Clean" DependsOnTargets="CleanSolution">
6667
<RemoveDir Directories="$(MSBuildThisFileDirectory)target"/>
68+
</Target>
69+
<Target Name="CleanSolution" Outputs="%(VisualStudioVersion.Identity)">
70+
6771
<ItemGroup>
6872
<ProjectToBuild Remove="@(ProjectToBuild)"/>
69-
<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)'">
70-
<Properties>Configuration=Release</Properties>
73+
<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)">
74+
<Properties>Configuration=Release;VisualStudioVersion=%(VisualStudioVersion.VisualStudioVersion)</Properties>
7175
</ProjectToBuild>
7276
</ItemGroup>
73-
<MSBuild Projects="@(ProjectToBuild)" Targets="Clean" />
77+
<MSBuild Projects="@(ProjectToBuild)" ToolsVersion="%(VisualStudioVersion.ToolsVersion)" Targets="Clean"/>
7478
</Target>
7579
<Target Name="DownloadNuGet">
7680
<MakeDir Directories="$(MSBuildThisFileDirectory)target\nuget"/>
@@ -79,17 +83,17 @@
7983
FileName="$(MSBuildThisFileDirectory)target\nuget\nuget.exe"/>
8084
</Target>
8185
<Target Name="RestoreNuGetPackages" DependsOnTargets="DownloadNuGet" Outputs="%(VisualStudioVersion.Identity)">
82-
<Message Text="Restoring nuget packages for '%(VisualStudioVersion.SolutionFile)'..." Importance="High" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)' and '%(VisualStudioVersion.NuGetPackageRestore)'=='true'"/>
83-
<Exec Command="$(NuGetExe) restore &quot;%(VisualStudioVersion.SolutionFile)&quot;" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)' and '%(VisualStudioVersion.NuGetPackageRestore)'=='true'"/>
86+
<Message Text="Restoring nuget packages for '%(VisualStudioVersion.SolutionFile)'..." Importance="High"/>
87+
<Exec Command="$(NuGetExe) restore &quot;%(VisualStudioVersion.SolutionFile)&quot;"/>
8488
</Target>
8589
<Target Name="Build" DependsOnTargets="RestoreNuGetPackages" Outputs="%(VisualStudioVersion.Identity)">
8690
<ItemGroup>
8791
<ProjectToBuild Remove="@(ProjectToBuild)"/>
88-
<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)" Condition="'%(VisualStudioVersion.MSBuildToolsVersion)'=='$(MSBuildToolsVersion)'">
89-
<Properties>Configuration=Release</Properties>
92+
<ProjectToBuild Include="%(VisualStudioVersion.SolutionFile)">
93+
<Properties>Configuration=Release;VisualStudioVersion=%(VisualStudioVersion.VisualStudioVersion)</Properties>
9094
</ProjectToBuild>
9195
</ItemGroup>
92-
<MSBuild Projects="@(ProjectToBuild)" Targets="Rebuild"/>
96+
<MSBuild Projects="@(ProjectToBuild)" ToolsVersion="%(VisualStudioVersion.ToolsVersion)" Targets="Rebuild"/>
9397
</Target>
9498
<Target Name="Package" DependsOnTargets="CreateNuGetPackage;CreateBinPackage;GenerateHelpFile"/>
9599
<Target Name="CreateNuGetPackage" DependsOnTargets="CopyBuildOutputToPackage">

src/Renci.SshNet.VS2012.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Renci.SshNet.WindowsPhone8"
1919
EndProject
2020
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}"
2121
ProjectSection(SolutionItems) = preProject
22-
..\build\build.cmd = ..\build\build.cmd
2322
..\build\build.proj = ..\build\build.proj
2423
EndProjectSection
2524
EndProject

src/Renci.SshNet.VS2015.sln

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2D6CAE62-D053-476F-9BDD-2B1F27FA9C5D}"
77
ProjectSection(SolutionItems) = preProject
8-
..\build\build.cmd = ..\build\build.cmd
98
..\build\build.proj = ..\build\build.proj
109
EndProjectSection
1110
EndProject

0 commit comments

Comments
 (0)