diff options
Diffstat (limited to '')
-rw-r--r-- | .github/workflows/build.yml | 17 | ||||
-rw-r--r-- | README.md | 21 | ||||
-rw-r--r-- | src/version.txt | 2 |
3 files changed, 19 insertions, 21 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a320821..94f4e1be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
@@ -1,14 +1,12 @@ | |||
1 | name: Build WiX Toolset v5 | 1 | name: Build WiX Toolset v6 |
2 | 2 | ||
3 | on: | 3 | on: |
4 | push: | 4 | push: |
5 | branches: | 5 | branches: |
6 | - master | 6 | - main |
7 | - develop | ||
8 | pull_request: | 7 | pull_request: |
9 | branches: | 8 | branches: |
10 | - master | 9 | - main |
11 | - develop | ||
12 | workflow_dispatch: | 10 | workflow_dispatch: |
13 | inputs: | 11 | inputs: |
14 | tags: | 12 | tags: |
@@ -29,9 +27,10 @@ jobs: | |||
29 | id-token: write | 27 | id-token: write |
30 | steps: | 28 | steps: |
31 | - name: Checkout code | 29 | - name: Checkout code |
32 | uses: actions/checkout@v3 | 30 | uses: actions/checkout@v4 |
33 | with: | 31 | with: |
34 | fetch-depth: 0 | 32 | fetch-depth: 0 |
33 | filter: tree:0 | ||
35 | 34 | ||
36 | # - name: Configure Visual Studio | 35 | # - name: Configure Visual Studio |
37 | # shell: cmd | 36 | # shell: cmd |
@@ -40,7 +39,7 @@ jobs: | |||
40 | - name: Install sign tool | 39 | - name: Install sign tool |
41 | if: (github.ref == 'refs/heads/master') | 40 | if: (github.ref == 'refs/heads/master') |
42 | shell: cmd | 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 |
44 | 43 | ||
45 | - name: Configure automated logging and crash dumps | 44 | - name: Configure automated logging and crash dumps |
46 | shell: cmd | 45 | shell: cmd |
@@ -62,7 +61,7 @@ jobs: | |||
62 | client-id: ${{ secrets.WIX_SIGNING_CLIENTID }} | 61 | client-id: ${{ secrets.WIX_SIGNING_CLIENTID }} |
63 | tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }} | 62 | tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }} |
64 | 63 | ||
65 | - name: Build wix5 | 64 | - name: Build wix6 |
66 | shell: cmd | 65 | shell: cmd |
67 | run: ./src/build_official.cmd | 66 | run: ./src/build_official.cmd |
68 | env: | 67 | env: |
@@ -107,5 +106,5 @@ jobs: | |||
107 | path: build/logs/ | 106 | path: build/logs/ |
108 | 107 | ||
109 | - name: Push to GitHub Packages | 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') |
111 | run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate | 110 | run: dotnet nuget push "build/artifacts/**/*.nupkg" --source https://nuget.pkg.github.com/wixtoolset/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate |
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | [](https://www.nuget.org/packages/wix) | 3 | [](https://www.nuget.org/packages/wix) |
4 | [](https://www.nuget.org/stats/packages/WiX?groupby=Version) | 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 | 6 | ||
7 | # WiX Toolset | 7 | # WiX Toolset |
8 | 8 | ||
@@ -37,9 +37,9 @@ This repository contains the WiX Toolset codebase. | |||
37 | 37 | ||
38 | ##### Getting started: | 38 | ##### Getting started: |
39 | 39 | ||
40 | * Fork the WiX repository (https://github.com/wixtoolset/wix.git) | 40 | * [Fork the WiX repository](https://github.com/wixtoolset/wix/fork) |
41 | into a GitHub domain that you control | 41 | into your own GitHub repository |
42 | * Clone the WiX repository from your fork (git clone https://github.com/yourdomain/wix.git) | 42 | * Clone the WiX repository from your fork (`git clone https://github.com/yourdomain/wix.git`) |
43 | into the directory of your choice | 43 | into the directory of your choice |
44 | 44 | ||
45 | ##### To build the WiX toolset: | 45 | ##### To build the WiX toolset: |
@@ -50,15 +50,14 @@ This repository contains the WiX Toolset codebase. | |||
50 | 50 | ||
51 | ##### Executing your newly built WiX toolset | 51 | ##### Executing your newly built WiX toolset |
52 | 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 | 54 | ||
55 | ##### Pull request expectations | 55 | ##### Pull request expectations |
56 | 56 | ||
57 | * Pick an outstanding WiX issue (or create one). Add a comment requesting that you be assigned to the issue. Wait for confirmation. | 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 PR fork a new branch from the develop branch | 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 behaviour is required for the PR | 59 | * Make changes to effect whatever changed behavior is required for the pull request |
60 | * Push the changes to your repository origin as needed | 60 | * Push the changes to your repository origin as needed |
61 | * If there are multiple commits squash them down to one commit. | 61 | * If the `main` branch has changed since you created your branch, rebase to the latest updates. |
62 | * If the develop branch has changed since you created your new branch rebase to the current development branch. | ||
63 | * If needed (ie, you squashed or rebased), do a force push of your branch | 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. |
diff --git a/src/version.txt b/src/version.txt index 0062ac97..3a8c0822 100644 --- a/src/version.txt +++ b/src/version.txt | |||
@@ -1 +1 @@ | |||
5.0.0 | 6.0.0-dev.1 | ||