Browse Source

dotnet 6 compatibility.

pull/6902/head
Dan Walmsley 4 years ago
parent
commit
b4d10d5ed9
  1. 12
      azure-pipelines.yml
  2. 2
      build/MicroCom.targets
  3. 3
      global.json
  4. 2
      src/tools/MicroComGenerator/MicroComGenerator.csproj

12
azure-pipelines.yml

@ -9,9 +9,9 @@ jobs:
version: 3.1.414 version: 3.1.414
- task: UseDotNet@2 - task: UseDotNet@2
displayName: 'Use .NET Core SDK 5.0.402' displayName: 'Use .NET Core SDK 6.0.101'
inputs: inputs:
version: 5.0.402 version: 6.0.101
- task: CmdLine@2 - task: CmdLine@2
displayName: 'Run Build' displayName: 'Run Build'
@ -40,9 +40,9 @@ jobs:
version: 3.1.414 version: 3.1.414
- task: UseDotNet@2 - task: UseDotNet@2
displayName: 'Use .NET Core SDK 5.0.402' displayName: 'Use .NET Core SDK 6.0.101'
inputs: inputs:
version: 5.0.402 version: 6.0.101
- task: CmdLine@2 - task: CmdLine@2
displayName: 'Install Mono 5.18' displayName: 'Install Mono 5.18'
@ -110,9 +110,9 @@ jobs:
version: 3.1.414 version: 3.1.414
- task: UseDotNet@2 - task: UseDotNet@2
displayName: 'Use .NET Core SDK 5.0.402' displayName: 'Use .NET Core SDK 6.0.101'
inputs: inputs:
version: 5.0.402 version: 6.0.101
- task: CmdLine@2 - task: CmdLine@2
displayName: 'Install Nuke' displayName: 'Install Nuke'

2
build/MicroCom.targets

@ -15,7 +15,7 @@
Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs" Inputs="@(AvnComIdl);$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/**/*.cs"
Outputs="%(AvnComIdl.OutputFile)"> Outputs="%(AvnComIdl.OutputFile)">
<Message Importance="high" Text="Generating file %(AvnComIdl.OutputFile) from @(AvnComIdl)" /> <Message Importance="high" Text="Generating file %(AvnComIdl.OutputFile) from @(AvnComIdl)" />
<Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/netcoreapp3.1/MicroComGenerator.dll&quot; -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)" <Exec Command="dotnet &quot;$(MSBuildThisFileDirectory)../src/tools/MicroComGenerator/bin/$(Configuration)/net6.0/MicroComGenerator.dll&quot; -i @(AvnComIdl) --cs %(AvnComIdl.OutputFile)"
LogStandardErrorAsError="true" /> LogStandardErrorAsError="true" />
<ItemGroup> <ItemGroup>
<!-- Remove and re-add generated file, this is needed for the clean build --> <!-- Remove and re-add generated file, this is needed for the clean build -->

3
global.json

@ -1,7 +1,4 @@
{ {
"sdk": {
"version": "5.0.402"
},
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.Build.Traversal": "1.0.43", "Microsoft.Build.Traversal": "1.0.43",
"MSBuild.Sdk.Extras": "2.0.54", "MSBuild.Sdk.Extras": "2.0.54",

2
src/tools/MicroComGenerator/MicroComGenerator.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net6.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" /> <PackageReference Include="CommandLineParser" Version="2.8.0" />

Loading…
Cancel
Save