Start WiX Toolset v6
Rob Mensching committed
Apr 7, 2024 at 02:49 UTC
973a1764223d7313beef03a66f6218905b07870b
3 files changed
+19
-21
.github/workflows/build.yml
+8
-9
@@ -1,14 +1,12 @@
1
-name: Build WiX Toolset v5
1
+name: Build WiX Toolset v6
2
3
on:
4
push:
5
branches:
6
- - master
7
- - develop
6
+ - main
7
pull_request:
8
branches:
10
- - master
11
- - develop
9
+ - main
10
workflow_dispatch:
11
inputs:
12
tags:
@@ -29,9 +27,10 @@ jobs:
27
id-token: write
28
steps:
29
- name: Checkout code
32
- uses: actions/checkout@v3
30
+ uses: actions/checkout@v4
31
with:
32
fetch-depth: 0
33
+ filter: tree:0
34
35
# - name: Configure Visual Studio
36
# shell: cmd
@@ -40,7 +39,7 @@ jobs:
39
- name: Install sign tool
40
if: (github.ref == 'refs/heads/master')
41
shell: cmd
43
- run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.23356.1
42
+ run: dotnet tool install --tool-path build\.tools sign --version 0.9.1-beta.24170.3
43
44
- name: Configure automated logging and crash dumps
45
shell: cmd
@@ -62,7 +61,7 @@ jobs:
61
client-id: ${{ secrets.WIX_SIGNING_CLIENTID }}
62
tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }}
63
65
- - name: Build wix5
64
+ - name: Build wix6
65
shell: cmd
66
run: ./src/build_official.cmd
67
env:
@@ -107,5 +106,5 @@ jobs:
106
path: build/logs/
107
108
- name: Push to GitHub Packages
110
- if: github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop')
109
+ if: github.event_name == 'push' && github.repository_owner == 'wixtoolset' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main')
110
run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
README.md
+10
-11
@@ -2,7 +2,7 @@
2
3
[](https://www.nuget.org/packages/wix)
4
[](https://www.nuget.org/stats/packages/WiX?groupby=Version)
5
-[](https://github.com/wixtoolset/wix/actions/workflows/build.yml?query=branch%3Adevelop)
5
+[](https://github.com/wixtoolset/wix/actions/workflows/build.yml?query=branch%3Amain)
6
7
# WiX Toolset
8
@@ -37,9 +37,9 @@ This repository contains the WiX Toolset codebase.
37
38
##### Getting started:
39
40
-* Fork the WiX repository (https://github.com/wixtoolset/wix.git)
41
- into a GitHub domain that you control
42
-* Clone the WiX repository from your fork (git clone https://github.com/yourdomain/wix.git)
40
+* [Fork the WiX repository](https://github.com/wixtoolset/wix/fork)
41
+ into your own GitHub repository
42
+* Clone the WiX repository from your fork (`git clone https://github.com/yourdomain/wix.git`)
43
into the directory of your choice
44
45
##### To build the WiX toolset:
@@ -50,15 +50,14 @@ This repository contains the WiX Toolset codebase.
50
51
##### Executing your newly built WiX toolset
52
53
- * `build\wix\Debug\publish\wix\wix --help` (Of course changing Debug to Release if you built in Release mode)
53
+ * `build\wix\Debug\publish\wix\wix --help` (Change `Debug` to `Release` if you built in release mode)
54
55
##### Pull request expectations
56
57
- * Pick an outstanding WiX issue (or create one). Add a comment requesting that you be assigned to the issue. Wait for confirmation.
58
- * To create a PR fork a new branch from the develop branch
59
- * Make changes to effect whatever changed behaviour is required for the PR
57
+ * Pick an [outstanding WiX issue](https://github.com/wixtoolset/issues/issues?q=is%3Aissue+is%3Aopen+label%3A%22up+for+grabs%22) (or [create a new one](https://github.com/wixtoolset/issues/issues/new/choose)). Add a comment requesting that you be assigned to the issue. Wait for confirmation.
58
+ * To create a pull request, [fork a new branch](https://github.com/wixtoolset/wix/fork) from the `main` branch
59
+ * Make changes to effect whatever changed behavior is required for the pull request
60
* Push the changes to your repository origin as needed
61
- * If there are multiple commits squash them down to one commit.
62
- * If the develop branch has changed since you created your new branch rebase to the current development branch.
61
+ * If the `main` branch has changed since you created your branch, rebase to the latest updates.
62
* If needed (ie, you squashed or rebased), do a force push of your branch
64
- * Create a PR with your branch against the WiX repository.
63
+ * Create a pull request with your branch against the WiX repository.
src/version.txt
+1
-1
@@ -1 +1 @@
1
-5.0.0
1
+6.0.0-dev.1