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.

Sign up for GitHub

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

Update to .NET9 #716

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Update to .NET9 #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b25f41b
Beginning changes
Joshua-Lester3 Jan 16, 2025
2de3721
Merge remote-tracking branch 'IntelliTect/main' into dev.UpdateToDotNet9
Joshua-Lester3 Jan 16, 2025
750cc18
Debugging
Joshua-Lester3 Jan 16, 2025
889b3b7
Changed import maps to use ImportMapDefinition and asp-importmap
Joshua-Lester3 Jan 16, 2025
cb911fe
Update Build-Test-And-Deploy.yml
BenjaminMichaelis Jan 22, 2025
87e88bb
Update Build-Test-And-Deploy.yml
BenjaminMichaelis Jan 22, 2025
4ffc07f
Update Build-Test-And-Deploy.yml
BenjaminMichaelis Jan 22, 2025
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
10 changes: 8 additions & 2 deletions .github/workflows/Build-Test-And-Deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@ jobs:
build-and-test:
runs-on: ubuntu-latest
environment: "BuildAndUploadImage"
env:
TEST_TAG: user/app:test

steps:
- uses: actions/checkout@v4

- run: |
[[ -z "${NUGET_AUTH_TOKEN}" ]] && echo 'does not exist' || echo "exists"
env:
NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}

- run: |
[[ -z "${{ secrets.AZURE_DEVOPS_PAT }}" ]] && echo 'does not exist' || echo "exists"

- name: Set up .NET Core
uses: actions/setup-dotnet@v4
with:
Expand Down
3 changes: 2 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<PackageVersion Include="ContentFeedNuget" Version="$(ToolingPackagesVersion)" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.1" />
<PackageVersion Include="EssentialCSharp.Shared.Models" Version="$(ToolingPackagesVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
<PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="8.3.0" />
Expand All @@ -38,4 +39,4 @@
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
</ItemGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions EssentialCSharp.Web.Tests/EssentialCSharp.Web.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>

<IsPackable>false</IsPackable>
<IsPublishable>false</IsPublishable>
Expand Down
5 changes: 3 additions & 2 deletions EssentialCSharp.Web/EssentialCSharp.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PlaceholderHtmlFile Include="$(ProjectDir)Placeholders/*.html" />
Expand All @@ -18,6 +18,7 @@
<PackageReference Include="IntelliTect.Multitool" />
<PackageReference Include="Mailjet.Api" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" />
<PackageReference Include="Microsoft.AspNetCore.Components" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
Expand Down
33 changes: 17 additions & 16 deletions EssentialCSharp.Web/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@
@using IntelliTect.Multitool
@using EssentialCSharp.Common
@inject ISiteMappingService _SiteMappings
@using Microsoft.AspNetCore.Components
@{
var prodMap = new ImportMapDefinition(
new Dictionary<string, string>
{
{ "vue", "./lib/vue/dist/vue.esm-browser.prod.js" },
{ "vue-window-size", "./lib/vue-window-size/composition-api/dist/index.js" },
}, null, null);
var devMap = new ImportMapDefinition(
new Dictionary<string, string>
{
{ "vue", "./lib/vue/dist/vue.esm-browser.js" },
{ "vue-window-size", "./lib/vue-window-size/composition-api/dist/index.js" },
}, null, null);
}
<!DOCTYPE html>
<html lang="en">
<head>
Expand Down Expand Up @@ -46,24 +61,10 @@
@*So that Safari can import modules*@
<script async src="/lib/es-module-shims/dist/es-module-shims.js"></script>
<environment include="Development">
<script type="importmap">
{
"imports": {
"vue": "./lib/vue/dist/vue.esm-browser.js",
"vue-window-size": "./lib/vue-window-size/composition-api/dist/index.js"
}
}
</script>
<script type="importmap" asp-importmap="@devMap"></script>
</environment>
<environment exclude="Development">
<script type="importmap">
{
"imports": {
"vue": "./lib/vue/dist/vue.esm-browser.prod.js",
"vue-window-size": "./lib/vue-window-size/composition-api/dist/index.js"
}
}
</script>
<script type="importmap" asp-importmap="@prodMap"></script>
</environment>
<script type="text/javascript">
(function (c, l, a, r, i, t, y) {
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "9.0.101",
"rollForward": "latestMinor"
}
}
Loading