Skip to content

Commit 912294a

Browse files
authored
The output ZIP had the wrong name (#1)
1 parent 5b2b468 commit 912294a

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

Build/default.ps1

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ properties {
88
$GitVersionExe = "$BaseDirectory\Lib\GitVersion.exe"
99
$ArtifactsDirectory = "$BaseDirectory\Artifacts"
1010

11-
$NuGetPushSource = ""
12-
1311
$MsBuildLoggerPath = ""
1412
$Branch = ""
1513
$MsTestPath = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\MSTest.exe"
1614
$RunTests = $false
1715
}
1816

19-
task default -depends Clean, ApplyAssemblyVersioning, ApplyPackageVersioning, RestoreNugetPackages, Compile, RunTests, BuildZip, BuildJsonPackage, PublishToMyget
17+
task default -depends Clean, ApplyAssemblyVersioning, ApplyPackageVersioning, RestoreNugetPackages, Compile, RunTests, BuildZip, BuildJsonPackage
2018

2119
task Clean {
2220
Get-ChildItem $PackageDirectory *.nupkg | foreach { Remove-Item $_.FullName }
@@ -96,11 +94,11 @@ task RunTests -precondition { return $RunTests -eq $true } {
9694

9795
task BuildZip {
9896
TeamCity-Block "Zipping up the binaries" {
99-
$assembly = Get-ChildItem -Path "$ArtifactsDirectory\Lib" -Filter FluentAssertions.dll -Recurse | Select-Object -first 1
97+
$assembly = Get-ChildItem -Path "$ArtifactsDirectory\Json\Lib" -Filter FluentAssertions.dll -Recurse | Select-Object -first 1
10098

10199
$versionNumber = $assembly.VersionInfo.FileVersion
102100

103-
& $7zip a -r "$ArtifactsDirectory\Fluent.Assertions.$versionNumber.zip" "$ArtifactsDirectory\Lib\*" -y
101+
& $7zip a -r "$ArtifactsDirectory\Fluent.Assertions.Json.$versionNumber.zip" "$ArtifactsDirectory\Json\Lib\*" -y
104102
}
105103
}
106104

@@ -110,19 +108,5 @@ task BuildJsonPackage -depends ExtractVersionsFromGit {
110108
}
111109
}
112110

113-
task PublishToMyget -precondition { return $env:NuGetApiKey } {
114-
TeamCity-Block "Publishing NuGet Package to Myget" {
115-
$packages = Get-ChildItem $ArtifactsDirectory *.nupkg
116-
117-
foreach ($package in $packages) {
118-
119-
if ($NuGetPushSource) {
120-
& $Nuget push $package.FullName $env:NuGetApiKey -Source "$NuGetPushSource"
121-
} else {
122-
& $Nuget push $package.FullName $env:NuGetApiKey
123-
}
124-
}
125-
}
126-
}
127111

128112

Src/FluentAssertions.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<projectUrl>http://www.fluentassertions.com</projectUrl>
1818
<dependencies>
1919
<group>
20-
<dependency id="FluentAssertions" version="$Version$" />
20+
<dependency id="FluentAssertions" version="[4.0.0,)" />
2121
<dependency id="Newtonsoft.Json" version="[6.0.7,)" />
2222
</group>
2323
<group targetFramework="netstandard1.3">
24-
<dependency id="FluentAssertions" version="$Version$" />
24+
<dependency id="FluentAssertions" version="[4.0.0,)" />
2525
<dependency id="Newtonsoft.Json" version="[9.0.1,)" />
2626
</group>
2727
</dependencies>

0 commit comments

Comments
 (0)