Browse Source

Merge branch 'wpfgridimport' of github.com:AvaloniaUI/Avalonia into wpfgridimport

pull/2563/head
Jumar Macato 7 years ago
parent
commit
b35dc13725
No known key found for this signature in database GPG Key ID: B19884DAC3A5BF3F
  1. 1
      .github/FUNDING.yml
  2. 1
      packages/Avalonia/Avalonia.csproj
  3. 1
      src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
  4. 1
      src/Avalonia.Desktop/Avalonia.Desktop.csproj
  5. 1
      src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
  6. 2
      src/Avalonia.X11/Avalonia.X11.csproj
  7. 1
      src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
  8. 1
      src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
  9. 1
      src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
  10. 1
      src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
  11. 1
      src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

1
.github/FUNDING.yml

@ -0,0 +1 @@
open_collective: avalonia

1
packages/Avalonia/Avalonia.csproj

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;netcoreapp2.0</TargetFrameworks>
<PackageId>Avalonia</PackageId>
</PropertyGroup>
<ItemGroup>

1
src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Avalonia.Controls.DataGrid</PackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />

1
src/Avalonia.Desktop/Avalonia.Desktop.csproj

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Avalonia.Desktop</PackageId>
</PropertyGroup>
<ItemGroup>

1
src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Avalonia.ReactiveUI</PackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\packages\Avalonia\Avalonia.csproj" />

2
src/Avalonia.X11/Avalonia.X11.csproj

@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PackageId>Avalonia.X11</PackageId>
</PropertyGroup>
<ItemGroup>

1
src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj

@ -3,6 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>$(DefineConstants);GTK3_PINVOKE</DefineConstants>
<PackageId>Avalonia.Gtk3</PackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />

1
src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj

@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PackageId>Avalonia.LinuxFramebuffer</PackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />

1
src/Skia/Avalonia.Skia/Avalonia.Skia.csproj

@ -3,6 +3,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Avalonia.Skia</RootNamespace>
<AssemblyName>Avalonia.Skia</AssemblyName>
<PackageId>Avalonia.Skia</PackageId>
<IncludeLinuxSkia>true</IncludeLinuxSkia>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

1
src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Avalonia.Direct2D1</PackageId>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Avalonia.Win32\Interop\UnmanagedMethods.cs">

1
src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<PackageId>Avalonia.Win32</PackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />

Loading…
Cancel
Save