Skip to content

Commit

Permalink
Merge branch 'master' into feature/202402-open-native
Browse files Browse the repository at this point in the history
# Conflicts:
#	history.md
  • Loading branch information
qdraw committed Feb 28, 2024
2 parents 80e946a + bb0b6a2 commit 12ceb73
Show file tree
Hide file tree
Showing 17 changed files with 294 additions and 135 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-swagger-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.200
dotnet-version: 8.0.201

- name: Cache nuget packages (*nix)
uses: actions/cache@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.200
dotnet-version: 8.0.201

- name: Build --no-unit-test linux-arm,linux-arm64,win-x64,osx-x64,linux-x64,osx-arm64 --ready-to-run
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-codecov-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.200
dotnet-version: 8.0.201

- name: Cache node modules clientapp (*nix)
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-dotnetcore-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.200
dotnet-version: 8.0.201

- name: Cache nuget packages (*nix)
uses: actions/cache@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-dotnetcore-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.200
dotnet-version: 8.0.201

- name: Build (Windows)
shell: pwsh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-sonarqube-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.200
dotnet-version: 8.0.201

- name: Use Java 17
uses: actions/setup-java@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/webapp-net-only-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.200
dotnet-version: 8.0.201

- name: "BuildNetCore (MacOS)"
shell: bash
Expand Down
1 change: 1 addition & 0 deletions history.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Semantic Versioning 2.0.0 is from version 0.1.6+

## version 0.6.0-beta.2 - _(Unreleased)_ - 2024-02-? {#v0.6.0-beta.2}

- [x] (Changed) Back-end Upgrade to .NET 8 - SDK 8.0.201 (Runtime: 8.0.2) (PR #1402)
- [x] (Added) _Back-end_ Native Open File on Windows & Mac OS (PR #1381)
- [x] (Added) _Back-end_ Native Open File with specific editor on Windows & Mac OS (PR #1381)
- [x] (Added) _Back-end_ AppSettings for Collections / Stacks and Open File (PR #1381)
Expand Down
4 changes: 2 additions & 2 deletions pipelines/azure/steps/use_dotnet_version.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
steps:
- task: UseDotNet@2
displayName: 'Use .NET SDK 8.0.200'
displayName: 'Use .NET SDK 8.0.201'
enabled: true
inputs:
packageType: sdk
version: 8.0.200
version: 8.0.201
installationPath: $(Agent.ToolsDirectory)/dotnet
223 changes: 192 additions & 31 deletions starsky-tools/end2end/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions starsky-tools/end2end/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"update:install": "npx --yes npm-check-updates -u && npm install"
},
"devDependencies": {
"@types/node": "^20.11.10",
"@types/node": "^20.11.16",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"cypress": "^13.6.3",
"@typescript-eslint/parser": "^6.21.0",
"cypress": "^13.6.4",
"eslint": "^8.56.0",
"eslint-config-standard-with-typescript": "^43.0.1",
"eslint-plugin-import": "^2.29.1",
Expand Down
Loading

0 comments on commit 12ceb73

Please sign in to comment.