Skip to content

Commit 1d51d21

Browse files
AArnottAArnott
committed
Simplify build authoring
Now that we don't use NuProj
1 parent b28b833 commit 1d51d21

File tree

8 files changed

+5
-139
lines changed

8 files changed

+5
-139
lines changed

‎init.ps1‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,11 @@ Param(
77
)
88

99
$oldPlatform=$env:Platform
10-
$env:Platform='AnyCPU' # Some people wander in here from a platform-specific build window.
10+
$env:Platform='Any CPU' # Some people wander in here from a platform-specific build window.
1111

1212
Push-Location $PSScriptRoot
1313
try {
14-
$toolsPath = "$PSScriptRoot\tools"
15-
16-
# First restore NuProj packages since the solution restore depends on NuProj evaluation succeeding.
17-
gci "$PSScriptRoot\src\project.json" -rec |? { $_.FullName -imatch 'nuget' } |% {
18-
& "$toolsPath\Restore-NuGetPackages.ps1" -Path $_ -Verbosity Quiet
19-
}
20-
21-
# Restore VS2017 style to get the rest of the projects.
22-
msbuild "$PSScriptRoot\src\NerdBank.GitVersioning.Tests\NerdBank.GitVersioning.Tests.csproj" /t:restore /v:minimal /m /nologo
14+
msbuild "$PSScriptRoot\src" /t:restore /v:minimal /m /nologo
2315

2416
Write-Host "Restoring NPM packages..." -ForegroundColor Yellow
2517
Push-Location "$PSScriptRoot\src\nerdbank-gitversioning.npm"

‎src/MSBuildExtensionTask/MSBuildExtensionTask.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
<ItemGroup>
99
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" PrivateAssets="all" />
10-
<PackageReference Include="NuProj.Common" Version="0.11.14-beta" PrivateAssets="all" />
1110
</ItemGroup>
1211
<ItemGroup Condition="'$(TargetFramework)' == 'net45' ">
1312
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" Condition=" '$(TargetFramework)' == 'netstandard1.3' " />
1313
<PackageReference Include="Validation" Version="2.3.7" />
1414
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" />
15-
<PackageReference Include="NuProj.Common" Version="0.11.14-beta" />
1615
</ItemGroup>
1716
<ItemGroup>
1817
<Compile Include="..\Shared\**\*.cs" LinkBase="Shared" />

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090

9191
<ItemGroup>
9292
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" />
93-
<PackageReference Include="NuProj.Common" Version="0.11.14-beta" />
9493
</ItemGroup>
9594
<ItemGroup>
9695
<ProjectReference Include="..\MSBuildExtensionTask\MSBuildExtensionTask.csproj" />

‎src/Nerdbank.GitVersioning.sln‎

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -28,69 +28,32 @@ EndProject
2828
Global
2929
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3030
Debug|Any CPU = Debug|Any CPU
31-
Debug|x64 = Debug|x64
32-
Debug|x86 = Debug|x86
3331
Release|Any CPU = Release|Any CPU
34-
Release|x64 = Release|x64
35-
Release|x86 = Release|x86
3632
EndGlobalSection
3733
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3834
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3935
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Debug|x64.ActiveCfg = Debug|Any CPU
41-
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Debug|x64.Build.0 = Debug|Any CPU
42-
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Debug|x86.ActiveCfg = Debug|Any CPU
43-
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Debug|x86.Build.0 = Debug|Any CPU
4436
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Release|Any CPU.ActiveCfg = Release|Any CPU
4537
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Release|Any CPU.Build.0 = Release|Any CPU
46-
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Release|x64.ActiveCfg = Release|Any CPU
47-
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Release|x64.Build.0 = Release|Any CPU
48-
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Release|x86.ActiveCfg = Release|Any CPU
49-
{C54F9EC8-FDA7-4D22-BCB2-7D97523BD91E}.Release|x86.Build.0 = Release|Any CPU
5038
{F79DD916-27B3-4CD0-97FF-5021B3CF9934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51-
{F79DD916-27B3-4CD0-97FF-5021B3CF9934}.Debug|x64.ActiveCfg = Debug|Any CPU
52-
{F79DD916-27B3-4CD0-97FF-5021B3CF9934}.Debug|x86.ActiveCfg = Debug|Any CPU
5339
{F79DD916-27B3-4CD0-97FF-5021B3CF9934}.Release|Any CPU.ActiveCfg = Release|Any CPU
54-
{F79DD916-27B3-4CD0-97FF-5021B3CF9934}.Release|x64.ActiveCfg = Release|Any CPU
55-
{F79DD916-27B3-4CD0-97FF-5021B3CF9934}.Release|x86.ActiveCfg = Release|Any CPU
5640
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5741
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Debug|Any CPU.Build.0 = Debug|Any CPU
58-
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Debug|x64.ActiveCfg = Debug|Any CPU
59-
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Debug|x64.Build.0 = Debug|Any CPU
60-
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Debug|x86.ActiveCfg = Debug|Any CPU
61-
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Debug|x86.Build.0 = Debug|Any CPU
6242
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Release|Any CPU.ActiveCfg = Release|Any CPU
6343
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Release|Any CPU.Build.0 = Release|Any CPU
64-
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Release|x64.ActiveCfg = Release|Any CPU
65-
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Release|x64.Build.0 = Release|Any CPU
66-
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Release|x86.ActiveCfg = Release|Any CPU
67-
{C7FA7B7A-0469-4B1C-8657-E274C4CD8ABB}.Release|x86.Build.0 = Release|Any CPU
6844
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6945
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Debug|Any CPU.Build.0 = Debug|Any CPU
70-
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Debug|x64.ActiveCfg = Debug|Any CPU
71-
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Debug|x64.Build.0 = Debug|Any CPU
72-
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Debug|x86.ActiveCfg = Debug|Any CPU
73-
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Debug|x86.Build.0 = Debug|Any CPU
7446
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Release|Any CPU.ActiveCfg = Release|Any CPU
7547
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Release|Any CPU.Build.0 = Release|Any CPU
76-
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Release|x64.ActiveCfg = Release|Any CPU
77-
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Release|x64.Build.0 = Release|Any CPU
78-
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Release|x86.ActiveCfg = Release|Any CPU
79-
{B2454569-6EDC-4FD4-9936-D2B2F2E10409}.Release|x86.Build.0 = Release|Any CPU
8048
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8149
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Debug|Any CPU.Build.0 = Debug|Any CPU
82-
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Debug|x64.ActiveCfg = Debug|Any CPU
83-
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Debug|x64.Build.0 = Debug|Any CPU
84-
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Debug|x86.ActiveCfg = Debug|Any CPU
85-
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Debug|x86.Build.0 = Debug|Any CPU
8650
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|Any CPU.ActiveCfg = Release|Any CPU
8751
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|Any CPU.Build.0 = Release|Any CPU
88-
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|x64.ActiveCfg = Release|Any CPU
89-
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|x64.Build.0 = Release|Any CPU
90-
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|x86.ActiveCfg = Release|Any CPU
91-
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|x86.Build.0 = Release|Any CPU
9252
EndGlobalSection
9353
GlobalSection(SolutionProperties) = preSolution
9454
HideSolutionNode = FALSE
9555
EndGlobalSection
56+
GlobalSection(ExtensibilityGlobals) = postSolution
57+
SolutionGuid = {4CF7AA29-5BBD-4294-9C92-DA689CF57200}
58+
EndGlobalSection
9659
EndGlobal

‎tools/Get-NuGetTool.ps1‎

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

‎tools/Install-NuGetPackage.ps1‎

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

‎tools/Restore-NuGetPackages.ps1‎

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

0 commit comments

Comments
 (0)