Skip to content

Commit b3b6ec9

Browse files
GordonBeemingGordonBeeming
authored
Upgrade to net8 rc1 (#92)
* Upgrading dependencies * Updating dockerfiles
1 parent 7fad8a8 commit b3b6ec9

File tree

10 files changed

+37
-31
lines changed

10 files changed

+37
-31
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "8.0.0-preview.7.23375.4",
6+
"version": "8.0.0-rc.1.23419.6",
77
"commands": [
88
"dotnet-ef"
99
]

‎GordonBeemingCom.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
77
ProjectSection(SolutionItems) = preProject
88
.editorconfig = .editorconfig
99
.gitignore = .gitignore
10+
docker-compose.yaml = docker-compose.yaml
1011
.config\dotnet-tools.json = .config\dotnet-tools.json
1112
global.json = global.json
1213
README.md = README.md
14+
up.ps1 = up.ps1
1315
EndProjectSection
1416
EndProject
1517
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GordonBeemingCom", "src\GordonBeemingCom\GordonBeemingCom.csproj", "{8116AA4A-CD45-4964-BFFA-A5133079DC4B}"
@@ -18,7 +20,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GordonBeemingCom.Database",
1820
EndProject
1921
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GordonBeemingCom.Editor", "src\GordonBeemingCom.Editor\GordonBeemingCom.Editor.csproj", "{497BA756-3A75-4702-AB4B-ECD0C9D32C8D}"
2022
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GordonBeemingCom.Shared", "src\GordonBeemingCom.Shared\GordonBeemingCom.Shared.csproj", "{9233A67A-E3F4-4D55-BDB8-63DE1ACE80A4}"
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GordonBeemingCom.Shared", "src\GordonBeemingCom.Shared\GordonBeemingCom.Shared.csproj", "{9233A67A-E3F4-4D55-BDB8-63DE1ACE80A4}"
2224
EndProject
2325
Global
2426
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
azurite:
2020
container_name: gordonbeemingcom-azurite
2121
hostname: gordonbeemingcom-azurite
22-
image: mcr.microsoft.com/azure-storage/azurite
22+
image: mcr.microsoft.com/azure-storage/azurite:latest
2323
ports:
2424
- 11000:10000
2525
- 11001:10001

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.7.23376.3",
4-
"rollForward": "disable"
3+
"version": "8.0.100-rc.1.23463.5",
4+
"rollForward": "latestMinor"
55
}
66
}

‎src/GordonBeemingCom.Database/GordonBeemingCom.Database.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.5.23280.1" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-preview.4.23259.3">
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.23419.6" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.1.23419.6">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.5.23280.1">
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-rc.1.23419.6">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>

‎src/GordonBeemingCom.Editor/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

3-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview-bookworm-slim-amd64 AS base
3+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
44
WORKDIR /app
55
EXPOSE 80
66
EXPOSE 443
77

8-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview-bookworm-slim-amd64 AS build
8+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
99
WORKDIR /src
1010
COPY ["global.json", "GordonBeemingCom.Editor/global.json"]
11+
COPY ["src/GordonBeemingCom.Shared/GordonBeemingCom.Shared.csproj", "GordonBeemingCom.Shared/"]
12+
COPY ["src/GordonBeemingCom.Database/GordonBeemingCom.Database.csproj", "GordonBeemingCom.Database/"]
1113
COPY ["src/GordonBeemingCom.Editor/GordonBeemingCom.Editor.csproj", "GordonBeemingCom.Editor/"]
1214
RUN dotnet restore "GordonBeemingCom.Editor/GordonBeemingCom.Editor.csproj"
1315
COPY src/. .

‎src/GordonBeemingCom.Editor/GordonBeemingCom.Editor.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BlazorMonaco" Version="3.0.0" />
13-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0-preview.5.23302.2" />
14-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-preview.5.23302.2" />
15-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0-preview.5.23302.2" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.5.23280.1" />
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-preview.4.23259.3">
12+
<PackageReference Include="BlazorMonaco" Version="3.1.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0-rc.1.23421.29" />
14+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-rc.1.23421.29" />
15+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0-rc.1.23421.29" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.23419.6" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.1.23419.6">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
21+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
2222
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2323
<PackageReference Include="TinyMCE.Blazor" Version="1.0.4" />
2424
</ItemGroup>

‎src/GordonBeemingCom.Shared/GordonBeemingCom.Shared.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Azure.Identity" Version="1.9.0" />
11-
<PackageReference Include="Azure.Storage.Blobs" Version="12.17.0" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-preview.5.23280.8" />
10+
<PackageReference Include="Azure.Identity" Version="1.10.1" />
11+
<PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-rc.1.23419.4" />
1313
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1414
</ItemGroup>
1515

‎src/GordonBeemingCom/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

3-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview-bookworm-slim-amd64 AS base
3+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
44
WORKDIR /app
55
EXPOSE 80
66
EXPOSE 443
77

8-
FROM mcr.microsoft.com/dotnet/sdk:8.0-preview-bookworm-slim-amd64 AS build
8+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
99
WORKDIR /src
1010
COPY ["global.json", "GordonBeemingCom/global.json"]
11+
COPY ["src/GordonBeemingCom.Shared/GordonBeemingCom.Shared.csproj", "GordonBeemingCom.Shared/"]
12+
COPY ["src/GordonBeemingCom.Database/GordonBeemingCom.Database.csproj", "GordonBeemingCom.Database/"]
1113
COPY ["src/GordonBeemingCom/GordonBeemingCom.csproj", "GordonBeemingCom/"]
1214
RUN dotnet restore "GordonBeemingCom/GordonBeemingCom.csproj"
1315
COPY src/. .

‎src/GordonBeemingCom/GordonBeemingCom.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0-preview.5.23302.2" />
23-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-preview.5.23302.2" />
24-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0-preview.5.23302.2" />
25-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.5.23280.1" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-preview.4.23259.3">
22+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0-rc.1.23421.29" />
23+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-rc.1.23421.29" />
24+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.0-rc.1.23421.29" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.1.23419.6" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.1.23419.6">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
31-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0-preview.5.23313.2" />
30+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
31+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0-rc.1.23461.3" />
3232

33-
<PackageReference Include="Azure.Storage.Blobs" Version="12.17.0" />
33+
<PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
3434
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0-beta3" />
3535
<PackageReference Include="Microsoft.ApplicationInsights.SnapshotCollector" Version="1.4.4" />
3636
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3737

38-
<PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0-preview.5.23280.8" />
38+
<PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0-rc.1.23419.4" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

0 commit comments

Comments
 (0)