Skip to content

Commit b863bee

Browse files
committed
use least supported framework
1 parent 0c847ce commit b863bee

File tree

7 files changed

+20
-24
lines changed

7 files changed

+20
-24
lines changed

Bruce/Bruce.csproj

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0-windows</TargetFramework>
66
<RootNamespace>Kerberos.NET.CommandLine</RootNamespace>
77

88
<PackAsTool>true</PackAsTool>
@@ -41,4 +41,10 @@
4141
<ProjectReference Include="..\Samples\KerbDumpCore\KerbDumpCore.csproj" />
4242
</ItemGroup>
4343

44+
<Target Name="RemoveTargetPlatformIdBeforePackingTool" BeforeTargets="_PackToolValidation">
45+
<PropertyGroup>
46+
<TargetPlatformIdentifier />
47+
</PropertyGroup>
48+
</Target>
49+
4450
</Project>

Samples/KerbDumpCore/KerbDumpCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0-windows</TargetFramework>
66
<UseWindowsForms>true</UseWindowsForms>
77

88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

Samples/KerberosClientApp/KerberosClientApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

Samples/KerberosKdcHostApp/KerberosKdcHostApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

Tests/Benchmark.Kerberos.NET/Benchmark.Kerberos.NET.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0-windows</TargetFramework>
5+
<TargetFramework>net6.0-windows</TargetFramework>
66
<ApplicationManifest>app.manifest</ApplicationManifest>
77

88
<DebugType>pdbonly</DebugType>

Tests/Tests.Kerberos.NET/Tests.Kerberos.NET.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0-windows</TargetFramework>
55

66
<DebugType>Full</DebugType>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

build.yaml

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ stages:
1616
vmImage: windows-latest
1717

1818
variables:
19-
BuildConfiguration: Release
2019
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2120

2221
steps:
2322
- task: UseDotNet@2
24-
displayName: 'Use .NET Core SDK 3.1.x'
23+
displayName: 'Use .NET SDK'
2524
inputs:
26-
version: 5.x
25+
version: 6.x
2726
performMultiLevelLookup: true
2827

2928
- task: DotNetCoreCLI@2
@@ -36,29 +35,20 @@ stages:
3635
- script: nbgv cloud
3736
displayName: Set Version
3837

39-
- task: MSBuild@1
40-
displayName: 'Build solution Kerberos.NET.sln'
38+
- task: DotNetCoreCLI@2
39+
displayName: 'Build and pack solution Kerberos.NET.sln'
4140
inputs:
42-
solution: Kerberos.NET.sln
43-
configuration: $(BuildConfiguration)
44-
msbuildArguments: /restore /p:CreatePackage=true
45-
maximumCpuCount: true
41+
command: 'custom'
42+
custom: 'pack'
43+
arguments: Kerberos.NET.sln -c Release --verbosity normal
4644

4745
# - task: DotNetCoreCLI@2
4846
# inputs:
4947
# command: test
5048
# projects: Tests/**/*.csproj
51-
# arguments: -c $(BuildConfiguration) --no-build --no-restore --settings CodeCoverage.runsettings --collect:"XPlat Code Coverage"
49+
# arguments: -c Release --no-build --no-restore --settings CodeCoverage.runsettings --collect:"XPlat Code Coverage"
5250
# displayName: Run Unit Tests
5351

54-
- task: DotNetCoreCLI@2
55-
inputs:
56-
command: 'pack'
57-
packagesToPack: './Bruce/Bruce.csproj'
58-
nobuild: true
59-
outputDir: $(Build.ArtifactStagingDirectory)
60-
displayName: Pack Bruce tool
61-
6252
- task: PublishBuildArtifacts@1
6353
inputs:
6454
PathtoPublish: '$(Build.ArtifactStagingDirectory)'

0 commit comments

Comments
 (0)