Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
dotnet-version: '10.0.x'
dotnet-quality: 'preview'
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/spms-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '9.0.x'
dotnet-version: '10.0.x'
dotnet-quality: 'preview'
- name: Install Dependencies
run: dotnet restore
- name: Build
Expand Down
1 change: 0 additions & 1 deletion .idea/.idea.SimplePasswordManagerService/.idea/aws.xml

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

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build-env
FROM mcr.microsoft.com/dotnet/sdk:10.0-preview-alpine AS build-env
WORKDIR /App

# Copy everything
Expand All @@ -9,7 +9,7 @@ RUN dotnet restore
RUN dotnet publish SimplePasswordManagerService -c Release -o out

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine
FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview-alpine
WORKDIR /App
COPY --from=build-env /App/out .
ENTRYPOINT ["dotnet", "SimplePasswordManagerService.dll"]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-preview.6.25358.103" />
<PackageReference Include="MongoDB.Driver" Version="3.4.2" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<!-- Roll forward to future major versions of the netcoreapp as needed -->
<RollForward>Major</RollForward>
</PropertyGroup>
Expand All @@ -12,7 +12,7 @@
<PackageReference Include="Amazon.CDK.AWS.AppRunner.Alpha" Version="2.207.0-alpha.0" />
<PackageReference Include="Amazon.CDK.Lib" Version="2.207.0" />
<PackageReference Include="Constructs" Version="10.4.2" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-preview.6.25358.103" />

<!-- jsii Roslyn analyzers (un-comment to obtain compile-time checks for missing required props
<PackageReference Include="Amazon.Jsii.Analyzers" Version="*" PrivateAssets="all" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -13,8 +13,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.6.25358.103" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-preview.6.25358.103" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-SimplePasswordManagerService-e87cf52d-48e4-43d3-8946-706d8aade0ef</UserSecretsId>
Expand All @@ -11,9 +11,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" NoWarn="NU1605" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.7" NoWarn="NU1605" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0-preview.6.25358.103" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0-preview.6.25358.103" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-preview.6.25358.103" />
<PackageReference Include="Microsoft.Identity.Web" Version="3.11.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="3.11.0" />
</ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,18 @@ parameters:
default: 'ap-southeast-1'

steps:
- task: UseDotNet@2
displayName: 'Install .NET 10 Preview'
inputs:
packageType: 'sdk'
version: '10.0.x'
includePreviewVersions: true
- script: npm install -g aws-cdk
displayName: 'Install AWS CDK'
- script: dotnet restore
displayName: 'Restore .NET packages'
- script: dotnet build --no-restore -c Release
displayName: 'Build .NET projects'
- script: cd SimplePasswordManagerService.Infra && cdk synth
displayName: 'CDK Synth'
- task: Docker@2
Expand Down
Loading