Skip to content

Commit f69037a

Browse files
elinohlssonElin Fokine
andauthored
Upgrade to .Net 10. (#536)
* Upgrade to .Net 10. * Upgrade Nuget packages. * Upgrade Identity Server sample project. * Remove legacy Azure deployment project from solution (removed unsupported .deployproj from sample, replaced deployment project with plain folder, kept ARM templates as reference for future modernization). * Use X509KeyStorageFlags.DefaultKeySet by default for embedded client test certificate and certificates loaded from Azure Key Vault, but make X509KeyStorageFlags overridable. * Rename folder VIews to Views. --------- Co-authored-by: Elin Fokine <ElinO@activesolution.se>
1 parent 9a09daf commit f69037a

32 files changed

Lines changed: 404 additions & 548 deletions

File tree

ActiveLogin.Authentication.sln

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.32112.339
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.3.11415.281 d18.3
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9A0CF459-87CC-448D-B49D-EFC3D6482AA6}"
77
ProjectSection(SolutionItems) = preProject
@@ -36,8 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution files", "Solution
3636
EndProject
3737
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8E4C5EA1-1B2E-4B78-9F44-6BC85E42A752}"
3838
EndProject
39-
Project("{151D2E53-A2C4-4D7D-83FE-D05416EBD58E}") = "AzureProvisioningSample", "samples\AzureProvisioningSample\AzureProvisioningSample.deployproj", "{ABC52082-8A5D-426E-B25A-D92934A51A4D}"
40-
EndProject
4139
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ActiveLogin.Authentication.BankId.AzureKeyVault", "src\ActiveLogin.Authentication.BankId.AzureKeyVault\ActiveLogin.Authentication.BankId.AzureKeyVault.csproj", "{D113E0AC-BDF2-4EAB-A2A3-F4B31E7871C6}"
4240
EndProject
4341
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{4764448D-A014-403F-A956-3F4CFFA00AF2}"
@@ -113,6 +111,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".devcontainer", ".devcontai
113111
EndProject
114112
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Phone.ConsoleSample", "samples\Phone.ConsoleSample\Phone.ConsoleSample.csproj", "{A77ECBA8-5F9F-4C60-A4D0-08CAC023E4BE}"
115113
EndProject
114+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureProvisioningSample", "AzureProvisioningSample", "{D365882F-BCB2-43BF-96B3-D5AC2B4D1810}"
115+
ProjectSection(SolutionItems) = preProject
116+
samples\AzureProvisioningSample\ActiveLogin-Monitor.json = samples\AzureProvisioningSample\ActiveLogin-Monitor.json
117+
samples\AzureProvisioningSample\ActiveLogin.json = samples\AzureProvisioningSample\ActiveLogin.json
118+
samples\AzureProvisioningSample\ActiveLogin.parameters.json = samples\AzureProvisioningSample\ActiveLogin.parameters.json
119+
EndProjectSection
120+
EndProject
116121
Global
117122
GlobalSection(SolutionConfigurationPlatforms) = preSolution
118123
Debug|Any CPU = Debug|Any CPU
@@ -131,10 +136,6 @@ Global
131136
{951B23A8-E123-4223-BF52-D28BD2665748}.Debug|Any CPU.Build.0 = Debug|Any CPU
132137
{951B23A8-E123-4223-BF52-D28BD2665748}.Release|Any CPU.ActiveCfg = Release|Any CPU
133138
{951B23A8-E123-4223-BF52-D28BD2665748}.Release|Any CPU.Build.0 = Release|Any CPU
134-
{ABC52082-8A5D-426E-B25A-D92934A51A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135-
{ABC52082-8A5D-426E-B25A-D92934A51A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
136-
{ABC52082-8A5D-426E-B25A-D92934A51A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
137-
{ABC52082-8A5D-426E-B25A-D92934A51A4D}.Release|Any CPU.Build.0 = Release|Any CPU
138139
{D113E0AC-BDF2-4EAB-A2A3-F4B31E7871C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
139140
{D113E0AC-BDF2-4EAB-A2A3-F4B31E7871C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
140141
{D113E0AC-BDF2-4EAB-A2A3-F4B31E7871C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -195,7 +196,6 @@ Global
195196
{A15234E7-CBF9-49CD-8D13-4CB02B045881} = {9A0CF459-87CC-448D-B49D-EFC3D6482AA6}
196197
{478B6428-4076-4446-8358-3B0C6FCC29D5} = {12A0FDF2-523E-42C7-81FE-4FDCA5E66A69}
197198
{951B23A8-E123-4223-BF52-D28BD2665748} = {9A0CF459-87CC-448D-B49D-EFC3D6482AA6}
198-
{ABC52082-8A5D-426E-B25A-D92934A51A4D} = {8E4C5EA1-1B2E-4B78-9F44-6BC85E42A752}
199199
{D113E0AC-BDF2-4EAB-A2A3-F4B31E7871C6} = {9A0CF459-87CC-448D-B49D-EFC3D6482AA6}
200200
{7D32EBEE-65D6-46D3-BC7E-65951C143969} = {4764448D-A014-403F-A956-3F4CFFA00AF2}
201201
{2FD5CA1D-04BB-4704-B8D8-B0A566E247A9} = {12A0FDF2-523E-42C7-81FE-4FDCA5E66A69}
@@ -214,6 +214,7 @@ Global
214214
{61360399-F211-4B18-88EE-2A6F4D2C1FE6} = {9A0CF459-87CC-448D-B49D-EFC3D6482AA6}
215215
{D3673E53-A774-46F0-9E44-97DF8F52D6D8} = {12A0FDF2-523E-42C7-81FE-4FDCA5E66A69}
216216
{A77ECBA8-5F9F-4C60-A4D0-08CAC023E4BE} = {8E4C5EA1-1B2E-4B78-9F44-6BC85E42A752}
217+
{D365882F-BCB2-43BF-96B3-D5AC2B4D1810} = {8E4C5EA1-1B2E-4B78-9F44-6BC85E42A752}
217218
EndGlobalSection
218219
GlobalSection(ExtensibilityGlobals) = postSolution
219220
SolutionGuid = {2076F58C-968B-489D-94CA-B3729F5DE10D}

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.414",
3+
"version": "10.0.101",
44
"rollForward": "latestFeature"
55
}
66
}

samples/AzureProvisioningSample/AzureProvisioningSample.deployproj

Lines changed: 0 additions & 37 deletions
This file was deleted.

samples/AzureProvisioningSample/Deploy-AzureResourceGroup.ps1

Lines changed: 0 additions & 118 deletions
This file was deleted.

samples/AzureProvisioningSample/Deployment.targets

Lines changed: 0 additions & 123 deletions
This file was deleted.

samples/IdentityServer.ClientSample/IdentityServer.ClientSample.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.10" />
22-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
21+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.2" />
22+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
2323
</ItemGroup>
2424

2525
</Project>

0 commit comments

Comments
 (0)