Skip to content

Commit 68ec5b7

Browse files
committed
Merge branch 'release/3.0.0'
* release/3.0.0: (29 commits) (build) Be more specific about how to run NuGet (doc) Fixed typo in about_boxstarter_bootstrapper (#505) (maint) link boxstarter.org repository (maint) crlf in Markdown files! (build) Get NuGet restore step working (#503) Remove website from repository (maint) Add .DS_Store file to .gitignore (build) Switch back to assembly version number (build) Use rc prerelease label (build) Minor tweak to asserted versions (build) Update VCS Root name (build) Add additional settings for GitVersion (build) Switch to using packageVersion (maint) Remove unnecessary files (build) Add missing Kotlin import (build) Add publishing of artifacts (#448) Use Choco to create NuGet packages (#448) Add extra metadata to nuspec files (maint) Remove build steps that aren't required (build) Fix passing of build counter ...
2 parents 783b49d + 88e79db commit 68ec5b7

20 files changed

+206
-299
lines changed

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Declare files that will always have CRLF line endings on checkout.
5+
*.md text eol=crlf

.teamcity/settings.kts

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
import jetbrains.buildServer.configs.kotlin.v2019_2.*
22
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
3+
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.nuGetPublish
34
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.powerShell
45
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
56
import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
67

78
version = "2021.2"
89

910
project {
10-
buildType(Build)
11+
buildType(Boxstarter)
1112
}
1213

13-
object Build : BuildType({
14+
object Boxstarter : BuildType({
15+
id = AbsoluteId("Boxstarter")
1416
name = "Build"
1517

1618
artifactRules = """
1719
buildArtifacts => buildArtifacts
1820
""".trimIndent()
1921

2022
params {
23+
param("env.vcsroot.branch", "%vcsroot.branch%")
24+
param("env.Git_Branch", "%teamcity.build.vcs.branch.Boxstarter_BoxstarterVcsRoot%")
25+
param("teamcity.git.fetchAllHeads", "true")
2126
param("env.CERT_SUBJECT_NAME", "Chocolatey Software, Inc.")
2227
}
2328

@@ -40,20 +45,31 @@ object Build : BuildType({
4045
""".trimIndent()
4146
}
4247
}
48+
4349
step {
4450
name = "Include Signing Keys"
4551
type = "PrepareSigningEnvironment"
46-
47-
conditions {
48-
equals("teamcity.build.branch.is_default", "true")
49-
}
5052
}
53+
5154
powerShell {
5255
name = "Build"
5356
scriptMode = file {
5457
path = "BuildScripts/build.ps1"
5558
}
56-
param("jetbrains_powershell_scriptArguments", "quick-deploy")
59+
param("jetbrains_powershell_scriptArguments", "quick-deploy -buildCounter %build.counter%")
60+
}
61+
62+
nuGetPublish {
63+
name = "Publish Packages"
64+
65+
conditions {
66+
matches("teamcity.build.branch", "^(develop|release/.*|hotfix/.*|tags/.*)${'$'}")
67+
}
68+
69+
toolPath = "%teamcity.tool.NuGet.CommandLine.DEFAULT%"
70+
packages = "buildArtifacts/*.nupkg"
71+
serverUrl = "%env.NUGETDEV_SOURCE%"
72+
apiKey = "%env.NUGETDEV_API_KEY%"
5773
}
5874
}
5975

Boxstarter.ClickOnce/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
// associated with an assembly.
66
[assembly: AssemblyTitle("Boxstarter.WebLaunch")]
77
[assembly: AssemblyProduct("Boxstarter.WebLaunch")]
8-
[assembly: AssemblyCopyright("(c) 2018 Chocolatey Software, Inc, 2012 - 2018 Matt Wrock")]
8+
[assembly: AssemblyCopyright("(c) 2018 - Present Chocolatey Software, Inc, 2012 - 2018 Matt Wrock")]
99
[assembly: AssemblyTrademark("8459d49a8d5a049d8936519ccf045706c7b3eb23")]
1010
[assembly: AssemblyVersion("2.13.0")]
1111
[assembly: AssemblyFileVersion("2.13.0")]
12+
[assembly: AssemblyInformationalVersion("2.13.0")]

BuildScripts/Boxstarter.zip.tmp

-46.7 KB
Binary file not shown.

BuildScripts/build.ps1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ param (
44
[string]$VmName,
55
[string]$package,
66
[string]$testName,
7-
[switch]$DoRelease
7+
[string]$buildCounter
88
)
99
$here = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
1010
if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall")){
@@ -18,6 +18,7 @@ if(!(Test-Path $env:ChocolateyInstall\lib\AzurePowershell*)) { choco install Azu
1818
if(!(Test-Path $env:ChocolateyInstall\lib\WindowsAzureLibsForNet*)) { choco install WindowsAzureLibsForNet --version=2.5 -y --no-progress }
1919
if(!(Test-Path $env:ChocolateyInstall\bin\nuget.exe)) { choco install nuget.commandline --version=5.4.0 -y --no-progress }
2020
if(!(Test-Path $env:ChocolateyInstall\bin\ReportUnit.exe)) { choco install reportunit --version=1.2.1 -y --source https://nuget.org/api/v2 --no-progress }
21+
if(!(Test-Path $env:ChocolateyInstall\lib\GitVersion.Portable\tools\gitversion.exe)) { choco install gitversion.portable --version=5.10.1 -y --no-progress }
2122

2223
if($Help){
2324
try {
@@ -27,14 +28,10 @@ if($Help){
2728
return
2829
}
2930

30-
if ($DoRelease) {
31-
$env:DO_BOXSTARTER_RELEASE = $true
32-
}
3331
$psakeDir = (Get-ChildItem $env:ChocolateyInstall\lib\Psake*)
3432
if($psakeDir.length -gt 0) {$psakeDir = $psakeDir[-1]}
3533
."$psakeDir\tools\psake\psake.ps1" "$here/default.ps1" $Action -ScriptPath $psakeDir\tools\psake -parameters $PSBoundParameters
3634

37-
$env:DO_BOXSTARTER_RELEASE = $false
3835
if($psake.build_success -eq $false) {
3936
exit 1;
4037
}

0 commit comments

Comments
 (0)