Skip to content

Commit

Permalink
Upgrade to .NET 8 (#76)
Browse files Browse the repository at this point in the history
  • Loading branch information
@PascalSenn
PascalSenn authored Apr 22, 2024
1 parent e0f44a8 commit 217f6d6
Show file tree
Hide file tree
Showing 107 changed files with 2,628 additions and 1,146 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-sonarscanner": {
"version": "4.8.0",
"version": "6.2.0",
"commands": [
"dotnet-sonarscanner"
]
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,3 +345,6 @@ appsettings.user.json
__mismatch__

.tye/

# vscode
.mono
77 changes: 48 additions & 29 deletions All.sln
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,73 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26124.0

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34310.174
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{17CDA34C-429F-421D-B245-538A6FFE8248}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IdentityServer", "IdentityServer", "{D264CAEC-2137-46D8-B637-FCE7CBE3B390}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Messaging.AzureServiceBus", "src\IdentityServer\Messaging.AzureServiceBus\Messaging.AzureServiceBus.csproj", "{C8F188CA-2671-4364-B53C-43832627C0DA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Messaging.AzureServiceBus", "src\IdentityServer\Messaging.AzureServiceBus\Messaging.AzureServiceBus.csproj", "{C8F188CA-2671-4364-B53C-43832627C0DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Messaging.RabbitMQ", "src\IdentityServer\Messaging.RabbitMQ\Messaging.RabbitMQ.csproj", "{9C1A424A-64A5-4BAA-BCE5-529F2148497F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Messaging.RabbitMQ", "src\IdentityServer\Messaging.RabbitMQ\Messaging.RabbitMQ.csproj", "{9C1A424A-64A5-4BAA-BCE5-529F2148497F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8D60C9DA-A2C2-4E35-803D-F26D2C665500}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer", "src\IdentityServer\samples\Server\IdentityServer.csproj", "{7CBB0012-7045-46CE-AEB9-A7F1B0C3FC4B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer", "src\IdentityServer\samples\Server\IdentityServer.csproj", "{7CBB0012-7045-46CE-AEB9-A7F1B0C3FC4B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32BFE3DD-3F5C-4DCA-AAE1-79A934C4A36D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abstractions", "src\IdentityServer\src\Abstractions\Abstractions.csproj", "{78B85AC5-F4DD-4EA8-9740-856CF90FE71E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abstractions", "src\IdentityServer\src\Abstractions\Abstractions.csproj", "{78B85AC5-F4DD-4EA8-9740-856CF90FE71E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hashing", "src\IdentityServer\src\Hashing\Hashing.csproj", "{A7D9158C-520D-4ADA-912E-B4743FFD7DDD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hashing", "src\IdentityServer\src\Hashing\Hashing.csproj", "{A7D9158C-520D-4ADA-912E-B4743FFD7DDD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\IdentityServer\src\IdentityServer.Core\Core.csproj", "{51234A0B-AC08-42C5-9155-47F649165B79}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\IdentityServer\src\IdentityServer.Core\Core.csproj", "{51234A0B-AC08-42C5-9155-47F649165B79}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.Storage", "src\IdentityServer\src\IdentityServer.Storage\IdentityServer.Storage.csproj", "{07867941-90C3-4150-9352-D048FBD1AEEE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.Storage", "src\IdentityServer\src\IdentityServer.Storage\IdentityServer.Storage.csproj", "{07867941-90C3-4150-9352-D048FBD1AEEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Store.Mongo", "src\IdentityServer\src\Store.Mongo\Store.Mongo.csproj", "{9507CA59-6ADC-47A7-AF29-558D7BB52E28}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Store.Mongo", "src\IdentityServer\src\Store.Mongo\Store.Mongo.csproj", "{9507CA59-6ADC-47A7-AF29-558D7BB52E28}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1DBE5F90-EF3B-4E54-AD41-AB9C8BFFE3E8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.Core.Tests", "src\IdentityServer\test\IdentityServer.Core.Tests\IdentityServer.Core.Tests.csproj", "{8011A525-B296-41FA-993E-7F29A484570E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.Core.Tests", "src\IdentityServer\test\IdentityServer.Core.Tests\IdentityServer.Core.Tests.csproj", "{8011A525-B296-41FA-993E-7F29A484570E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.Store.Mongo.Tests", "src\IdentityServer\test\IdentityServer.Store.Mongo.Tests\IdentityServer.Store.Mongo.Tests.csproj", "{43B8687A-914D-484A-B797-75F19F7E7A8E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.Store.Mongo.Tests", "src\IdentityServer\test\IdentityServer.Store.Mongo.Tests\IdentityServer.Store.Mongo.Tests.csproj", "{43B8687A-914D-484A-B797-75F19F7E7A8E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{CAC6A27B-7731-4C85-AF4F-15FB80F9F264}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F70ABE9E-7F4E-4F4C-B75B-96B9222F03A4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Abstractions", "src\Server\src\Abstractions\Abstractions.csproj", "{8B841259-2367-4CE4-A0AC-DB6AA5FA00C1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abstractions", "src\Server\src\Abstractions\Abstractions.csproj", "{8B841259-2367-4CE4-A0AC-DB6AA5FA00C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api.Host", "src\Server\src\Api.Host\Api.Host.csproj", "{920A5537-8C02-42A8-84C1-4BC69EED9964}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api.Host", "src\Server\src\Api.Host\Api.Host.csproj", "{920A5537-8C02-42A8-84C1-4BC69EED9964}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNet", "src\Server\src\AspNet\AspNet.csproj", "{2476563B-3A39-42C8-B9D0-A12D0BE9B885}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet", "src\Server\src\AspNet\AspNet.csproj", "{2476563B-3A39-42C8-B9D0-A12D0BE9B885}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authorization", "src\Server\src\Authorization\Authorization.csproj", "{9D0FD147-4B9A-4236-81B6-5A23EA5957FB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authorization", "src\Server\src\Authorization\Authorization.csproj", "{9D0FD147-4B9A-4236-81B6-5A23EA5957FB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Server\src\Core\Core.csproj", "{991CE3E1-C0A2-4227-A29C-F01A7C2CDD1A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Server\src\Core\Core.csproj", "{991CE3E1-C0A2-4227-A29C-F01A7C2CDD1A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphQL", "src\Server\src\GraphQL\GraphQL.csproj", "{7B9BB801-6E35-4BA1-962E-464476EE2D53}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL", "src\Server\src\GraphQL\GraphQL.csproj", "{7B9BB801-6E35-4BA1-962E-464476EE2D53}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Store.Mongo", "src\Server\src\Store.Mongo\Store.Mongo.csproj", "{91F9856A-B0D8-4D26-857A-A9D544B615D3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Store.Mongo", "src\Server\src\Store.Mongo\Store.Mongo.csproj", "{91F9856A-B0D8-4D26-857A-A9D544B615D3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C02928F2-8843-47FA-BE18-5510B6092929}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Tests", "src\Server\test\Core.Tests\Core.Tests.csproj", "{D6DDBA6C-975D-4EE7-AAE3-80170E08C745}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Tests", "src\Server\test\Core.Tests\Core.Tests.csproj", "{D6DDBA6C-975D-4EE7-AAE3-80170E08C745}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphQL.Tests", "src\Server\test\GraphQL.Tests\GraphQL.Tests.csproj", "{5EC6727A-EC5B-43FE-8202-81CF1B224550}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphQL.Tests", "src\Server\test\GraphQL.Tests\GraphQL.Tests.csproj", "{5EC6727A-EC5B-43FE-8202-81CF1B224550}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host.Tests", "src\Server\test\Host.Tests\Host.Tests.csproj", "{2C46F9C1-2FCC-464F-BFB6-A766588C326B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Host.Tests", "src\Server\test\Host.Tests\Host.Tests.csproj", "{2C46F9C1-2FCC-464F-BFB6-A766588C326B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{826ED872-18E8-4FA5-B3D1-0F5F87ED9CD6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdOps.Importer", "src\Server\tools\IdOps.Importer\IdOps.Importer.csproj", "{8DE8BDC4-D486-40D5-8A01-9995F9669A27}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdOps.Importer", "src\Server\tools\IdOps.Importer\IdOps.Importer.csproj", "{8DE8BDC4-D486-40D5-8A01-9995F9669A27}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthTokenGenerator", "src\Server\src\AuthTokenGenerator\AuthTokenGenerator.csproj", "{EE6AEEED-F8EC-47A2-96D6-588C5C5B1725}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthTokenGenerator", "src\Server\src\AuthTokenGenerator\AuthTokenGenerator.csproj", "{EE6AEEED-F8EC-47A2-96D6-588C5C5B1725}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthTokenGenerator.Tests", "src\Server\test\AuthTokenGenerator.Tests\AuthTokenGenerator.Tests.csproj", "{4FB823F5-63E5-415D-9F8A-F49F014B8A79}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthTokenGenerator.Tests", "src\Server\test\AuthTokenGenerator.Tests\AuthTokenGenerator.Tests.csproj", "{4FB823F5-63E5-415D-9F8A-F49F014B8A79}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Store.Mongo.Tests", "src\Server\test\Store.Mongo.Tests\Store.Mongo.Tests.csproj", "{65BCE070-F2EB-4812-BC59-B1E439356086}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -75,9 +78,6 @@ Global
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C8F188CA-2671-4364-B53C-43832627C0DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8F188CA-2671-4364-B53C-43832627C0DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand Down Expand Up @@ -355,6 +355,21 @@ Global
{4FB823F5-63E5-415D-9F8A-F49F014B8A79}.Release|x64.Build.0 = Release|Any CPU
{4FB823F5-63E5-415D-9F8A-F49F014B8A79}.Release|x86.ActiveCfg = Release|Any CPU
{4FB823F5-63E5-415D-9F8A-F49F014B8A79}.Release|x86.Build.0 = Release|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Debug|x64.ActiveCfg = Debug|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Debug|x64.Build.0 = Debug|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Debug|x86.ActiveCfg = Debug|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Debug|x86.Build.0 = Debug|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Release|Any CPU.Build.0 = Release|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Release|x64.ActiveCfg = Release|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Release|x64.Build.0 = Release|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Release|x86.ActiveCfg = Release|Any CPU
{65BCE070-F2EB-4812-BC59-B1E439356086}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D264CAEC-2137-46D8-B637-FCE7CBE3B390} = {17CDA34C-429F-421D-B245-538A6FFE8248}
Expand Down Expand Up @@ -388,5 +403,9 @@ Global
{8DE8BDC4-D486-40D5-8A01-9995F9669A27} = {826ED872-18E8-4FA5-B3D1-0F5F87ED9CD6}
{EE6AEEED-F8EC-47A2-96D6-588C5C5B1725} = {F70ABE9E-7F4E-4F4C-B75B-96B9222F03A4}
{4FB823F5-63E5-415D-9F8A-F49F014B8A79} = {C02928F2-8843-47FA-BE18-5510B6092929}
{65BCE070-F2EB-4812-BC59-B1E439356086} = {C02928F2-8843-47FA-BE18-5510B6092929}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {535806C4-C844-4EB4-8F0B-7382A8CD1CEF}
EndGlobalSection
EndGlobal
57 changes: 57 additions & 0 deletions Directory.Packages.props
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AnyClone" Version="1.1.6" />
<PackageVersion Include="AnyDiff" Version="1.0.91" />
<PackageVersion Include="Azure.Identity" Version="1.10.4" />
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.6.0" />
<PackageVersion Include="Duende.IdentityServer" Version="7.0.4" />
<PackageVersion Include="Duende.IdentityServer.Storage" Version="7.0.4" />
<PackageVersion Include="FluentValidation" Version="11.9.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Handlebars.Net" Version="2.1.6" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="13.9.0" />
<PackageVersion Include="HotChocolate.AspNetCore.Authorization" Version="13.9.0" />
<PackageVersion Include="IdentityModel" Version="7.0.0" />
<PackageVersion Include="MassTransit" Version="8.2.1" />
<PackageVersion Include="MassTransit.Azure.ServiceBus.Core" Version="8.2.1" />
<PackageVersion Include="MassTransit.RabbitMQ" Version="8.2.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.4" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.4" />
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="8.0.4" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.25.0" />
<PackageVersion Include="MongoDB.Extensions.Context" Version="3.5.0" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.8.0" />
<PackageVersion Include="Snapshooter.Xunit" Version="0.14.1" />
<PackageVersion Include="Squadron.Mongo" Version="0.18.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="ValueInjecter" Version="3.2.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="xunit" Version="2.7.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "6.0.405",
"version": "8.0.100",
"rollForward": "latestMajor",
"allowPrerelease": true
}
}
}
2 changes: 1 addition & 1 deletion pull-request-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pr:
name: $(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)

pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-22.04

variables:
- group: Tokens
Expand Down
2 changes: 1 addition & 1 deletion release-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ trigger:
name: $(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r)

pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-22.04

variables:
- group: Tokens
Expand Down
5 changes: 2 additions & 3 deletions src/Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
<PropertyGroup>
<PropsAbove>$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))</PropsAbove>
</PropertyGroup>
<Import Project="$([MSBuild]::GetPathOfFileAbove('Versions.props', '$(MSBuildThisFileDirectory)'))" />
<Import Project="$(PropsAbove)" Condition="Exists($(PropsAbove))" />

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>IdOps</RootNamespace>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand Down Expand Up @@ -39,7 +38,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
</ItemGroup>

<PropertyGroup>
Expand Down
Loading

0 comments on commit 217f6d6

Please sign in to comment.