Moved version and xaml props to build directory.

added Directory.Build.Props to src & samples directory. cleaned up Avalonia.Markup.csproj. Will do more test to do the same on Avalonia.Markup.Xaml.
8 years ago · b161593994
28 changed files with 21 additions and 72 deletions
--- a/src/Shared/CompileXaml.props
+++ b/src/Shared/CompileXaml.props
--- a/build/SharedVersion.props
+++ b/build/SharedVersion.props
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\SharedVersion.props" />
+</Project>
--- a/samples/RenderTest/RenderTest.csproj
+++ b/samples/RenderTest/RenderTest.csproj
@ -22,8 +22,7 @@
    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj" />
  </ItemGroup>
-  <Import Project="..\..\src\Shared\Shared.props" />
-  <Import Project="..\..\src\Shared\CompileXaml.props" />
+  <Import Project="..\..\build\EmbedXaml.props" />
  <Import Project="..\..\build\Serilog.props" />
  <Import Project="..\..\build\Rx.props" />
  <Import Project="..\..\build\ReactiveUI.props" />
--- a/samples/VirtualizationTest/VirtualizationTest.csproj
+++ b/samples/VirtualizationTest/VirtualizationTest.csproj
@ -22,8 +22,7 @@
    <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
    <ProjectReference Include="..\..\src\Avalonia.Logging.Serilog\Avalonia.Logging.Serilog.csproj" />
  </ItemGroup>
-  <Import Project="..\..\src\Shared\Shared.props" />
-  <Import Project="..\..\src\Shared\CompileXaml.props" />
+  <Import Project="..\..\build\EmbedXaml.props" />
  <Import Project="..\..\build\Serilog.props" />
  <Import Project="..\..\build\Rx.props" />
  <Import Project="..\..\build\ReactiveUI.props" />
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@ -5,6 +5,5 @@
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
  <Import Project="..\..\build\Rx.props" />
 </Project>
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@ -4,7 +4,6 @@
    <AssemblyName>Avalonia.Base</AssemblyName>
    <RootNamespace>Avalonia</RootNamespace>
  </PropertyGroup>
-  <Import Project="..\Shared\Shared.props" />
  <Import Project="..\..\build\Base.props" />
  <Import Project="..\..\build\Rx.props" />
  <Import Project="..\..\build\JetBrains.Annotations.props" />
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@ -13,7 +13,6 @@
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
  <Import Project="..\..\build\Rx.props" />
  <Import Project="..\..\build\JetBrains.Annotations.props" />
 </Project>
--- a/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
+++ b/src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Avalonia.Diagnostics</AssemblyName>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj" />
@ -15,8 +14,7 @@
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
    <ProjectReference Include="..\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj" />
-  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
-  <Import Project="..\Shared\CompileXaml.props" />
+  </ItemGroup>  
+  <Import Project="..\..\build\EmbedXaml.props" />
  <Import Project="..\..\build\Rx.props" />
 </Project>
--- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
+++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj
@ -4,9 +4,6 @@
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
    <DefineConstants>$(DefineConstants);DOTNETCORE</DefineConstants>
  </PropertyGroup>
-  <PropertyGroup>
-    <DocumentationFile>bin\$(Configuration)\Avalonia.DotNetCoreRuntime.xml</DocumentationFile>
-  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
@ -15,8 +12,7 @@
    <ProjectReference Include="..\OSX\Avalonia.MonoMac\Avalonia.MonoMac.csproj" />
    <ProjectReference Include="..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
    <ProjectReference Include="..\Windows\Avalonia.Win32\Avalonia.Win32.csproj" />
-  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
+  </ItemGroup>  
  <Import Project="..\..\build\NetCore.props" />
  <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" />
 </Project>
--- a/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
+++ b/src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
@ -11,8 +11,7 @@
        <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
        <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
        <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-    </ItemGroup>
-    <Import Project="..\Shared\Shared.props" />
+    </ItemGroup>    
    <Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
    <Import Project="..\..\build\Rx.props" />
    <Import Project="..\..\build\NetFX.props" />
--- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
+++ b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
@ -20,6 +20,6 @@
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
+  
  <Import Project="..\..\build\Rx.props" />
 </Project>
--- a/src/Avalonia.Input/Avalonia.Input.csproj
+++ b/src/Avalonia.Input/Avalonia.Input.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Avalonia.Input</AssemblyName>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@ -9,7 +8,6 @@
    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
+  </ItemGroup>  
  <Import Project="..\..\build\Rx.props" />
 </Project>
--- a/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
+++ b/src/Avalonia.Interactivity/Avalonia.Interactivity.csproj
@ -9,7 +9,6 @@
    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
  <Import Project="..\..\build\Rx.props" />
 </Project>

--- a/src/Avalonia.Layout/Avalonia.Layout.csproj
+++ b/src/Avalonia.Layout/Avalonia.Layout.csproj
@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Avalonia.Layout</AssemblyName>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
+  </ItemGroup>  
  <Import Project="..\..\build\Rx.props" />
 </Project>
--- a/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
+++ b/src/Avalonia.Logging.Serilog/Avalonia.Logging.Serilog.csproj
@ -6,7 +6,6 @@
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
+  </ItemGroup>  
  <Import Project="..\..\build\Serilog.props" />
 </Project>
--- a/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
+++ b/src/Avalonia.ReactiveUI/Avalonia.ReactiveUI.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Avalonia.ReactiveUI</AssemblyName>
  </PropertyGroup>
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
@ -13,7 +12,6 @@
    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
  <Import Project="..\..\build\Rx.props" />
  <Import Project="..\..\build\ReactiveUI.props" />
 </Project>
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@ -9,6 +9,5 @@
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
  <Import Project="..\..\build\Rx.props" />
 </Project>
--- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
+++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj
@ -12,8 +12,7 @@
    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
-  <Import Project="..\Shared\CompileXaml.props" />
+  </ItemGroup>  
+  <Import Project="..\..\build\EmbedXaml.props" />
  <Import Project="..\..\build\Rx.props" />
 </Project>
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
@ -6,7 +6,6 @@
  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-  </ItemGroup>
-  <Import Project="..\Shared\Shared.props" />
+  </ItemGroup>  
  <Import Project="..\..\build\Rx.props" />
 </Project>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\build\SharedVersion.props" />
+</Project>
--- a/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
+++ b/src/Gtk/Avalonia.Gtk3/Avalonia.Gtk3.csproj
@ -11,5 +11,4 @@
    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
  </ItemGroup>
-  <Import Project="..\..\Shared\Shared.props" />
 </Project>
--- a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
+++ b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
@ -10,6 +10,5 @@
    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
    <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
-  </ItemGroup>
-  <Import Project="..\..\Shared\Shared.props" />
+  </ItemGroup>  
 </Project>
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@ -26,9 +26,6 @@
    <NoWarn>CS1591</NoWarn>
  </PropertyGroup>
    <ItemGroup>
-        <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-            <Link>Properties\SharedAssemblyInfo.cs</Link>
-        </Compile>
        <Compile Include="AvaloniaXamlLoaderPortableXaml.cs" />
        <Compile Include="AvaloniaXamlLoader.cs" />
        <Compile Include="Converters\CornerRadiusTypeConverter.cs" />
--- a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
@ -5,6 +5,5 @@ using System.Reflection;
 using Avalonia.Metadata;
 using System.Runtime.CompilerServices;

-[assembly: AssemblyTitle("Avalonia.Markup")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup")]
 [assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests")]
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@ -3,33 +3,6 @@
    <TargetFramework>netstandard2.0</TargetFramework>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Avalonia.Markup.xml</DocumentationFile>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Avalonia.Markup.xml</DocumentationFile>
-    <NoWarn>CS1591</NoWarn>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
--- a/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj
+++ b/src/OSX/Avalonia.MonoMac/Avalonia.MonoMac.csproj
@ -17,6 +17,5 @@
    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
  </ItemGroup>
-  <Import Project="..\..\Shared\Shared.props" />
  <Import Project="..\..\..\build\MonoMac.props" />
 </Project>
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@ -16,7 +16,7 @@
    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
  </ItemGroup>
-  <Import Project="..\..\Shared\Shared.props" />
+  
  <Import Project="..\..\..\build\SkiaSharp.props" />
  <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
 </Project>