This commit is contained in:
Wiesław Šoltés 2020-12-11 09:00:04 +00:00 коммит произвёл GitHub
Родитель 31036d33b6
Коммит 961cf49548
4 изменённых файлов: 11 добавлений и 11 удалений

2
.github/workflows/build.yml поставляемый
Просмотреть файл

@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core - name: Setup .NET Core
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 3.1.100 dotnet-version: 5.0.100
- name: Build Release - name: Build Release
run: dotnet build --configuration Release run: dotnet build --configuration Release
- name: Test Release - name: Test Release

Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks> <TargetFrameworks>net5.0;net461</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Update="**\*.xaml.cs"> <Compile Update="**\*.xaml.cs">
@ -13,13 +13,13 @@
<AvaloniaResource Include="Assets\*" /> <AvaloniaResource Include="Assets\*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.0-preview5" /> <PackageReference Include="Avalonia" Version="0.10.0-rc1" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" /> <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc1" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview5" /> <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-rc1" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview5" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-rc1" />
<PackageReference Include="Dock.Avalonia" Version="0.10.0-preview5" /> <PackageReference Include="Dock.Avalonia" Version="0.10.0-rc1" />
<PackageReference Include="Dock.Avalonia.Themes.Default" Version="0.10.0-preview5" /> <PackageReference Include="Dock.Avalonia.Themes.Default" Version="0.10.0-rc1" />
<PackageReference Include="Dock.Model.ReactiveUI" Version="0.10.0-preview5" /> <PackageReference Include="Dock.Model.ReactiveUI" Version="0.10.0-rc1" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" /> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
</Project> </Project>

Просмотреть файл

@ -10,6 +10,6 @@ namespace AvaloniaDockApplication
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>() => AppBuilder.Configure<App>()
.UsePlatformDetect() .UsePlatformDetect()
.LogToDebug(); .LogToTrace();
} }
} }

Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace></RootNamespace> <RootNamespace></RootNamespace>
<IsPackable>False</IsPackable> <IsPackable>False</IsPackable>