Skip to content

Commit a2d2557

Browse files
gep13gep13
committed
Merge branch 'release/1.0.0'
* release/1.0.0: (33 commits) (#928) Update Chocolatey CLI to latest release (build) Bump to version 0.4.2 of the Recipe (build) Bump to version 0.4.1 of the Recipe (build) Bump to version 0.4.0 of the Recipe (build) Bump to version 0.3.0 of the Recipe (maint) Add sources explicitly during cake build (#928) Update Chocolatey CLI to latest pre-release (build) Bump to Recipe 0.2.6 (build) Make dependencies more consistent (build) Bump to recipe 0.2.5 (build) Bump to Recipe 0.2.4 (build) Update to Recipe 0.2.3 (build) Remove vcs Id from pullRequest feature (build) Bump to latest Recipe package (build) Update build configuration files (build) Adds Missing Dependency for PullRequest Feature (build) Adds TeamCity build definition (version) v1.0.0-alpha (#915) Fix keyboard bindings in conjunction with aggregated source view [ImgBot] Optimize images ...
2 parents 803556b + be627f4 commit a2d2557

34 files changed

+500
-461
lines changed

‎.appveyor.yml

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

‎.github/workflows/build.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
- "feature/**"
9+
- "release/**"
10+
- "hotfix/**"
11+
tags:
12+
- "*"
13+
pull_request:
14+
15+
# Allows you to run this workflow manually from the Actions tab
16+
workflow_dispatch:
17+
18+
jobs:
19+
build:
20+
runs-on: windows-2019
21+
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
22+
steps:
23+
- name: Checkout the repository
24+
uses: actions/checkout@v2
25+
26+
- name: Fetch all tags and branches
27+
run: git fetch --prune --unshallow
28+
29+
- name: Cache Tools
30+
uses: actions/cache@v2
31+
with:
32+
path: |
33+
tools
34+
Source/packages
35+
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
36+
37+
- name: Build project
38+
run: |
39+
./build.ps1 --target=CI
40+
41+
- name: Upload Issues-Report
42+
uses: actions/upload-artifact@v2
43+
with:
44+
if-no-files-found: warn
45+
name: issues
46+
path: code_drop/issues-report.html
47+
48+
- name: Upload Packages
49+
uses: actions/upload-artifact@v2
50+
with:
51+
if-no-files-found: warn
52+
name: package
53+
path: code_drop/Packages/**/*

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ tools/**
199199
!tools/Addins/packages.config
200200
!tools/Modules/packages.config
201201
BuildArtifacts/
202+
code_drop/
202203
\.vs/
203204

204205
# Transifex related
@@ -223,5 +224,6 @@ docs/input/tasks
223224
.DS_Store
224225

225226
SolutionInfo.cs
227+
SolutionVersion.cs
226228

227229
config.wyam.packages.xml

‎.teamcity/pom.xml

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
<?xml version="1.0"?>
2+
<project>
3+
<modelVersion>4.0.0</modelVersion>
4+
<name>Chocolatey GUI Config DSL Script</name>
5+
<groupId>Chocolatey</groupId>
6+
<artifactId>ChocolateyGUI</artifactId>
7+
<version>1.0-SNAPSHOT</version>
8+
9+
<parent>
10+
<groupId>org.jetbrains.teamcity</groupId>
11+
<artifactId>configs-dsl-kotlin-parent</artifactId>
12+
<version>1.0-SNAPSHOT</version>
13+
</parent>
14+
15+
<repositories>
16+
<repository>
17+
<id>jetbrains-all</id>
18+
<url>https://download.jetbrains.com/teamcity-repository</url>
19+
<snapshots>
20+
<enabled>true</enabled>
21+
</snapshots>
22+
</repository>
23+
<repository>
24+
<id>teamcity-server</id>
25+
<url>https://teamcityserver/app/dsl-plugins-repository</url>
26+
<snapshots>
27+
<enabled>true</enabled>
28+
</snapshots>
29+
</repository>
30+
</repositories>
31+
32+
<pluginRepositories>
33+
<pluginRepository>
34+
<id>JetBrains</id>
35+
<url>https://download.jetbrains.com/teamcity-repository</url>
36+
</pluginRepository>
37+
</pluginRepositories>
38+
39+
<build>
40+
<sourceDirectory>${basedir}</sourceDirectory>
41+
<plugins>
42+
<plugin>
43+
<artifactId>kotlin-maven-plugin</artifactId>
44+
<groupId>org.jetbrains.kotlin</groupId>
45+
<version>${kotlin.version}</version>
46+
47+
<configuration/>
48+
<executions>
49+
<execution>
50+
<id>compile</id>
51+
<phase>process-sources</phase>
52+
<goals>
53+
<goal>compile</goal>
54+
</goals>
55+
</execution>
56+
<execution>
57+
<id>test-compile</id>
58+
<phase>process-test-sources</phase>
59+
<goals>
60+
<goal>test-compile</goal>
61+
</goals>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
<plugin>
66+
<groupId>org.jetbrains.teamcity</groupId>
67+
<artifactId>teamcity-configs-maven-plugin</artifactId>
68+
<version>${teamcity.dsl.version}</version>
69+
<configuration>
70+
<format>kotlin</format>
71+
<dstDir>target/generated-configs</dstDir>
72+
</configuration>
73+
</plugin>
74+
</plugins>
75+
</build>
76+
77+
<dependencies>
78+
<dependency>
79+
<groupId>org.jetbrains.teamcity</groupId>
80+
<artifactId>configs-dsl-kotlin</artifactId>
81+
<version>${teamcity.dsl.version}</version>
82+
<scope>compile</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.jetbrains.teamcity</groupId>
86+
<artifactId>configs-dsl-kotlin-plugins</artifactId>
87+
<version>1.0-SNAPSHOT</version>
88+
<type>pom</type>
89+
<scope>compile</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.jetbrains.kotlin</groupId>
93+
<artifactId>kotlin-stdlib-jdk8</artifactId>
94+
<version>${kotlin.version}</version>
95+
<scope>compile</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.jetbrains.kotlin</groupId>
99+
<artifactId>kotlin-script-runtime</artifactId>
100+
<version>${kotlin.version}</version>
101+
<scope>compile</scope>
102+
</dependency>
103+
</dependencies>
104+
</project>

‎.teamcity/settings.kts

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
import jetbrains.buildServer.configs.kotlin.v2019_2.*
2+
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
3+
import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.powerShell
4+
import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
5+
import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
6+
import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
7+
8+
version = "2021.2"
9+
10+
project {
11+
buildType(ChocolateyGUI)
12+
}
13+
14+
object ChocolateyGUI : BuildType({
15+
id = AbsoluteId("ChocolateyGUI")
16+
name = "Build"
17+
18+
artifactRules = """
19+
code_drop/MsBuild.log
20+
code_drop/MSBuild.msi.log
21+
code_drop/ChocolateyGUI.msi
22+
code_drop/TestResults/issues-report.html
23+
code_drop/Packages/**/*.nupkg
24+
""".trimIndent()
25+
26+
params {
27+
param("env.vcsroot.branch", "%vcsroot.branch%")
28+
param("env.Git_Branch", "%teamcity.build.vcs.branch.ChocolateyGUI_ChocolateyGuiVcsRoot%")
29+
param("teamcity.git.fetchAllHeads", "true")
30+
password("env.TRANSIFEX_API_TOKEN", "credentialsJSON:c81283e6-cf59-5c9e-9766-6f465018a295", display = ParameterDisplay.HIDDEN, readOnly = true)
31+
password("env.GITHUB_PAT", "%system.GitHubPAT%", display = ParameterDisplay.HIDDEN, readOnly = true)
32+
}
33+
34+
vcs {
35+
root(DslContext.settingsRoot)
36+
37+
branchFilter = """
38+
+:*
39+
""".trimIndent()
40+
}
41+
42+
steps {
43+
powerShell {
44+
name = "Prerequisites"
45+
scriptMode = script {
46+
content = """
47+
# Install Chocolatey Requirements
48+
if ((Get-WindowsFeature -Name NET-Framework-Features).InstallState -ne 'Installed') {
49+
Install-WindowsFeature -Name NET-Framework-Features
50+
}
51+
52+
choco install windows-sdk-7.1 netfx-4.0.3-devpack visualstudio2019buildtools netfx-4.8-devpack --confirm --no-progress
53+
exit ${'$'}LastExitCode
54+
""".trimIndent()
55+
}
56+
}
57+
58+
step {
59+
name = "Include Signing Keys"
60+
type = "PrepareSigningEnvironment"
61+
}
62+
63+
script {
64+
name = "Call Cake"
65+
scriptContent = "call build.official.bat"
66+
}
67+
}
68+
69+
triggers {
70+
vcs {
71+
branchFilter = ""
72+
}
73+
}
74+
75+
features {
76+
pullRequests {
77+
provider = github {
78+
authType = token {
79+
token = "%system.GitHubPAT%"
80+
}
81+
}
82+
}
83+
}
84+
})

‎GitVersion.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
next-version: 1.0.0

‎Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
<Reference Include="Caliburn.Micro.Platform.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
6868
<HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
6969
</Reference>
70-
<Reference Include="chocolatey, Version=0.11.1.0, Culture=neutral, PublicKeyToken=79d02ea9cad655eb, processorArchitecture=MSIL">
71-
<HintPath>..\packages\chocolatey.lib.0.11.1\lib\chocolatey.dll</HintPath>
70+
<Reference Include="chocolatey, Version=1.0.0.0, Culture=neutral, PublicKeyToken=79d02ea9cad655eb, processorArchitecture=MSIL">
71+
<HintPath>..\packages\chocolatey.lib.1.0.0\lib\chocolatey.dll</HintPath>
7272
<SpecificVersion>False</SpecificVersion>
7373
<Private>False</Private>
7474
</Reference>
@@ -224,8 +224,8 @@
224224
<None Include="packages.config" />
225225
</ItemGroup>
226226
<ItemGroup>
227-
<Compile Include="..\SolutionInfo.cs">
228-
<Link>Properties\SolutionInfo.cs</Link>
227+
<Compile Include="..\SolutionVersion.cs">
228+
<Link>Properties\SolutionVersion.cs</Link>
229229
</Compile>
230230
<Compile Include="Controls\Dialogs\IClosableDialog.cs" />
231231
<Compile Include="Controls\Dialogs\IClosableChildWindow.cs" />

‎Source/ChocolateyGui.Common.Windows/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,10 @@
1414
// set of attributes. Change these attribute values to modify the information
1515
// associated with an assembly.
1616
[assembly: AssemblyTitle("Chocolatey GUI Common Windows Assembly")]
17-
[assembly: AssemblyDescription("Shareable Windows specific code for Chocolatey GUI")]
1817
#if DEBUG
1918
[assembly: AssemblyConfiguration("Debug")]
2019
#else
2120
[assembly: AssemblyConfiguration("Release")]
2221
#endif
23-
[assembly: AssemblyTrademark("")]
2422
[assembly: AssemblyCulture("")]
25-
[assembly: NeutralResourcesLanguage("en-US")]
26-
[assembly: CLSCompliant(false)]
27-
28-
[assembly: ComVisible(false)]
23+
[assembly: NeutralResourcesLanguage("en-US")]

‎Source/ChocolateyGui.Common.Windows/ViewModels/ShellViewModel.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using ChocolateyGui.Common.Models.Messages;
1313
using ChocolateyGui.Common.Providers;
1414
using ChocolateyGui.Common.Services;
15+
using ChocolateyGui.Common.ViewModels;
1516
using ChocolateyGui.Common.Windows.Commands;
1617
using ChocolateyGui.Common.Windows.Utilities;
1718
using ChocolateyGui.Common.Windows.ViewModels.Items;
@@ -159,7 +160,7 @@ private bool CanGoToSource(object obj)
159160
}
160161

161162
var sourceIndex = obj as int?;
162-
return sourceIndex.HasValue && sourceIndex > 0 && sourceIndex <= _sourcesViewModel.Items.Count;
163+
return sourceIndex.HasValue && sourceIndex > 0 && sourceIndex <= _sourcesViewModel.Items.Count(vm => !(vm is SourceSeparatorViewModel));
163164
}
164165

165166
private void GoToSource(object obj)
@@ -169,12 +170,13 @@ private void GoToSource(object obj)
169170
{
170171
--sourceIndex;
171172

172-
if (sourceIndex < 0 || sourceIndex > _sourcesViewModel.Items.Count)
173+
var items = _sourcesViewModel.Items.Where(vm => !(vm is SourceSeparatorViewModel)).ToList();
174+
if (sourceIndex < 0 || sourceIndex > items.Count)
173175
{
174176
return;
175177
}
176178

177-
_sourcesViewModel.ActivateItem(_sourcesViewModel.Items[sourceIndex.Value]);
179+
_sourcesViewModel.ActivateItem(items[sourceIndex.Value]);
178180
}
179181
}
180182

‎Source/ChocolateyGui.Common.Windows/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="BuildTools.FxCop" version="1.0.1" targetFramework="net40" />
66
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net48" />
77
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net48" />
8-
<package id="chocolatey.lib" version="0.11.1" targetFramework="net452" />
8+
<package id="chocolatey.lib" version="1.0.0" targetFramework="net48" />
99
<package id="ControlzEx" version="4.4.0" targetFramework="net48" />
1010
<package id="Fizzler" version="1.2.0" targetFramework="net48" />
1111
<package id="HarfBuzzSharp" version="2.6.1.4" targetFramework="net48" />

0 commit comments

Comments
 (0)