tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6902 from AvaloniaUI/features/net6-support 

net6.0 sdk
release/0.10.11-rc.1
Dan Walmsley 4 years ago
parent
cdf1546a28
commit
fd99a232d9
6 changed files with 19 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      azure-pipelines.yml
  2. 4
      build/HarfBuzzSharp.props
  3. 2
      build/MicroCom.targets
  4. 4
      build/SkiaSharp.props
  5. 6
      global.json
  6. 2
      src/tools/MicroComGenerator/MicroComGenerator.csproj

17
azure-pipelines.yml
View File

@ -1,3 +1,6 @@
variables:
MSBuildEnableWorkloadResolver: 'false'
jobs: jobs:
- job: Linux - job: Linux
pool: pool:
@ -9,9 +12,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.100'
inputs: inputs:
version: 5.0.402 version: 6.0.100
- task: CmdLine@2 - task: CmdLine@2
displayName: 'Run Build' displayName: 'Run Build'
@ -40,9 +43,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.100'
inputs: inputs:
version: 5.0.402 version: 6.0.100
- task: CmdLine@2 - task: CmdLine@2
displayName: 'Install Mono 5.18' displayName: 'Install Mono 5.18'
@ -56,7 +59,7 @@ jobs:
inputs: inputs:
script: | script: |
export PATH="`pwd`/sdk:$PATH" export PATH="`pwd`/sdk:$PATH"
cd src/tools/MicroComGenerator; dotnet run -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h cd src/tools/MicroComGenerator; dotnet run -f net6.0 -i ../../Avalonia.Native/avn.idl --cpp ../../../native/Avalonia.Native/inc/avalonia-native.h
- task: Xcode@5 - task: Xcode@5
inputs: inputs:
@ -110,9 +113,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.100'
inputs: inputs:
version: 5.0.402 version: 6.0.100
- task: CmdLine@2 - task: CmdLine@2
displayName: 'Install Nuke' displayName: 'Install Nuke'

4
build/HarfBuzzSharp.props
View File

@ -1,6 +1,6 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<PackageReference Include="HarfBuzzSharp" Version="2.6.1.7" /> <PackageReference Include="HarfBuzzSharp" Version="2.8.2-preview.155" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.6.1.7" /> <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2-preview.155" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
build/MicroCom.targets
View File

@ -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 -->

4
build/SkiaSharp.props
View File

@ -1,6 +1,6 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.80.2" /> <PackageReference Include="SkiaSharp" Version="2.88.0-preview.155" />
<PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.80.2" /> <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.155" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
global.json
View File

@ -1,7 +1,7 @@
{ {
"sdk": { "sdk": {
"version": "5.0.402" "version": "6.0.100"
}, },
"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
View File

@ -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> <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" /> <PackageReference Include="CommandLineParser" Version="2.8.0" />

Write Preview
Loading…
Cancel
Save