Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚧 Upgrade to .net 8 #36

Merged
merged 7 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,27 @@ jobs:
build:
runs-on: ubuntu-latest

# TODO: also use ARM paramaters
# TODO: resource names should be paramaterised
steps:
- uses: actions/checkout@v2
- name: Setup .NET 3.1.x
- name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x
dotnet-version: 8.0.x

- name: Restore dependencies
working-directory: Functions/
working-directory: SSW.Rules.AzFuncs/
run: dotnet restore

- name: Build
working-directory: Functions/
working-directory: SSW.Rules.AzFuncs/
run: dotnet build --no-restore

- name: Deploy
working-directory: Functions/
run: dotnet publish
--configuration Release
--output ../deploy
working-directory: SSW.Rules.AzFuncs/
run: |
dotnet publish \
--configuration Release \
--output ../deploy

- name: Upload a Build Artifact
uses: actions/[email protected]
Expand All @@ -45,10 +44,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Setup .NET 5.0.x
- name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 8.0.x

- name: Generate ARM Template
working-directory: Azure/
Expand Down Expand Up @@ -100,15 +99,10 @@ jobs:
resourceGroupName: ${{ secrets.AZURE_RG }}
template: arm-template.json

- name: Setup .NET 3.1.x
- name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x

- name: Login with Azure CLI
uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}
dotnet-version: 8.0.x

- uses: actions/download-artifact@v2
with:
Expand All @@ -120,4 +114,4 @@ jobs:
id: fa
with:
app-name: ${{ secrets.AZURE_RG_PREFIX }}-functions
package: deploy
package: deploy
28 changes: 14 additions & 14 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ jobs:
build:
runs-on: ubuntu-latest

# TODO: also use ARM paramaters
steps:
- uses: actions/checkout@v2
- name: Setup .NET 3.1.x
- name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x
dotnet-version: 8.0.x

- name: Restore dependencies
working-directory: Functions/
working-directory: SSW.Rules.AzFuncs/
run: dotnet restore

- name: Build
working-directory: Functions/
working-directory: SSW.Rules.AzFuncs/
run: dotnet build --no-restore

- name: Deploy
working-directory: Functions/
run: dotnet publish
--configuration Release
--output ../deploy
working-directory: SSW.Rules.AzFuncs/
run: |
dotnet publish \
--configuration Release \
--output ../deploy

- name: Upload a Build Artifact
uses: actions/[email protected]
Expand All @@ -43,10 +43,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Setup .NET 5.0.x
- name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 8.0.x

- name: Generate ARM Template
working-directory: Azure/
Expand Down Expand Up @@ -97,10 +97,10 @@ jobs:
resourceGroupName: ${{ secrets.AZURE_RG }}
template: arm-template.json

- name: Setup .NET 3.1.x
- name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x
dotnet-version: 8.0.x

- name: Login with Azure CLI
uses: azure/login@v1
Expand All @@ -117,4 +117,4 @@ jobs:
id: fa
with:
app-name: ${{ secrets.AZURE_RG_PREFIX }}-functions
package: deploy
package: deploy
4 changes: 2 additions & 2 deletions Azure/Azure.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Compile Include="Program.fs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Farmer" Version="1.2.0" />
<PackageReference Include="Farmer" Version="1.8.1" />
</ItemGroup>

</Project>
11 changes: 0 additions & 11 deletions Functions/Domain/Bookmark.cs

This file was deleted.

17 changes: 0 additions & 17 deletions Functions/Domain/Reaction.cs

This file was deleted.

16 changes: 0 additions & 16 deletions Functions/Domain/RuleHistoryCache.cs

This file was deleted.

13 changes: 0 additions & 13 deletions Functions/Domain/RuleHistoryData.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Functions/Domain/SecretContent.cs

This file was deleted.

10 changes: 0 additions & 10 deletions Functions/Domain/SyncHistory.cs

This file was deleted.

12 changes: 0 additions & 12 deletions Functions/Domain/User.cs

This file was deleted.

47 changes: 0 additions & 47 deletions Functions/Functions/AuthCMS/AuthenticateNetlify.cs

This file was deleted.

Loading
Loading