Skip to content

Commit

Permalink
Merge pull request #135 from sebagomez/master
Browse files Browse the repository at this point in the history
Update to dotnet 8
  • Loading branch information
sebagomez authored Nov 21, 2023
2 parents 2ab47d7 + 009fdaf commit 44d9bdc
Show file tree
Hide file tree
Showing 213 changed files with 5,351 additions and 21,127 deletions.
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

github: sebagomez
ko_fi: sebagomez
open_collective: azure-storage-explorer
21 changes: 21 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "nuget"
directory: "/src/web"
schedule:
interval: "weekly"
- package-ecosystem: "nuget"
directory: "/src/StorageLibrary"
schedule:
interval: "weekly"
- package-ecosystem: "docker"
directory: "/src"
schedule:
interval: "weekly"
commit-message:
# Prefix all commit messages with "[docker] " (no colon, but a trailing whitespace)
prefix: "[docker] "
32 changes: 21 additions & 11 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,41 @@ on:
paths:
- build-image/*
- src/**
- version.sh
- .github/workflows/docker-build.yml

env:
config: Release
solution: ./AzureWebExplorer.sln
docker_user: sebagomez
repository: azurestorageexplorer

jobs:

deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install XMLLint
run: sudo apt-get install libxml2-utils
run: |
sudo apt-get update
sudo apt-get install libxml2-utils
- name: Get tagname
run: echo "build_number=$(./version.sh)" >> $GITHUB_ENV

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ env.docker_user }}
password: ${{ secrets.DOCKERHUB_TOKEN }}


- name: Build and push Docker images
uses: docker/build-push-action@v1.1.1
uses: docker/build-push-action@v5
with:
username: sebagomez
password: ${{ secrets.DOCKER_PASSWORD }}
tags: latest,${{ env.build_number }}
build_args: BUILD=${{ env.build_number }}
add_git_labels: false
path: ./src
tags: ${{ env.docker_user }}/${{ env.repository }}:latest,${{ env.docker_user }}/${{ env.repository }}:${{ env.build_number }}
build-args: BUILD=${{ env.build_number }}
context: ./src
push: true
12 changes: 9 additions & 3 deletions .github/workflows/dotnet-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,28 @@ on:
push:
paths:
- src/**
- tests/**
- .github/workflows/dotnet-build.yml
pull_request:
paths:
- src/**
- tests/**
- .github/workflows/dotnet-build.yml

env:
config: Release
solution: ./AzureWebExplorer.sln

jobs:

build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
- name: Local Build
run: dotnet build --configuration Release ./src/AzureWebStorageExplorer/AzureWebStorageExplorer.csproj
run: dotnet build --configuration $config ./src/web/web.csproj
- name: Run Tests
run: dotnet test ./tests/StorageLibTests/StorageLibTests.csproj
28 changes: 20 additions & 8 deletions .github/workflows/helm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master
paths:
- helm/**/*
- src/AzureWebStorageExplorer/Directory.Build.props
- src/web/Directory.Build.props
- .github/workflows/helm-release.yml

env:
Expand All @@ -19,25 +19,37 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Configure Git
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
- name: Install XMLLint
run: sudo apt-get install libxml2-utils
run: |
sudo apt-get update
sudo apt-get install libxml2-utils
- name: Install Helm
uses: azure/setup-helm@v1
uses: azure/setup-helm@v3
with:
version: v3.4.0
version: v3.10.0

- name: Get tagname
run: |
build_number=$(./version.sh)
echo $build_number
sed -i -E "s/appVersion:.*/appVersion: \"$build_number\"/" ./helm/azureexplorer/Chart.yaml
sed -i -E "s/ tag:.*/ tag: \"$build_number\"/" ./helm/azureexplorer/values.yaml
app_number=$(sed 's/\.//g' <<< $build_number)
echo $app_number
sed -i -E "s/appVersion:.*/appVersion: \"$build_number\"/" ./helm/azurestorageexplorer/Chart.yaml
sed -i -E "s/REPLACE_APP_VERSION/$app_number/" ./helm/azurestorageexplorer/Chart.yaml
sed -i -E "s/ tag:.*/ tag: \"$build_number\"/" ./helm/azurestorageexplorer/values.yaml
- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.2.1
uses: helm/chart-releaser-action@v1.5.0
with:
charts_dir: helm
env:
Expand Down
10 changes: 1 addition & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
bin/
obj/
.svn/
.vs/
.vscode/

PublishProfiles/
Docker/root/
packages/
**/node_modules/
**/wwwroot/dist/
!**/**/wwwroot/dist/azurewebexplorer.css
**/Properties/launchSettings.json
Expand All @@ -17,6 +11,4 @@ packages/
private*.data

.DS_Store
publish.bat

npm-shrinkwrap.json
azurestorageexplorer.sln
97 changes: 97 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/AzureWebStorageExplorer/bin/Debug/net8.0/AzureWebStorageExplorer.dll",
"args": [],
"cwd": "${workspaceFolder}/src/AzureWebStorageExplorer",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development",
"MOCK": "true"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": "BlazorWASM",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/wasm/bin/Debug/net8.0/wasm.dll",
"args": [],
"cwd": "${workspaceFolder}/src/wasm",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": "Blazor WEB",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/web/bin/Debug/net8.0/web.dll",
"args": [],
"cwd": "${workspaceFolder}/src/web",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": "Blazor WEB (Mock)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/web/bin/Debug/net8.0/web.dll",
"args": [],
"cwd": "${workspaceFolder}/src/web",
"stopAtEntry": false,
"serverReadyAction": {
"action": "openExternally",
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development",
"MOCK": "true",
"APPVERSION": "MOCK",
"BASEPATH": "app"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach"
}
]
}
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"editor.detectIndentation": false,
"editor.insertSpaces": false
}
64 changes: 64 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/web/web.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/wasm/wasm.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/src/wasm/wasm.csproj"
],
"problemMatcher": "$msCompile"
},
{
"label": ".NET Core Test with debugger",
"type": "process",
"isBackground": true,
"command": "dotnet",
"args": [
"test"
],
"options": {
"cwd": "${workspaceFolder}/tests/StorageLibTests",
"env": {
"VSTEST_HOST_DEBUG": "1"
},
},
"group": "test",
"presentation": {
"echo": true,
"reveal": "always",
"focus": false,
"panel": "shared"
},
"problemMatcher": []
},
]
}
Loading

0 comments on commit 44d9bdc

Please sign in to comment.