Browse Source

Remove SharedAssemblyInfo and unused avalonia.platform.targets

pull/1815/head
Jeremy Koritzinsky 8 years ago
parent
commit
17ec885e15
  1. 13
      parameters.cake
  2. 19
      src/Shared/SharedAssemblyInfo.cs
  3. 20
      src/Shared/avalonia.platform.targets

13
parameters.cake

@ -1,10 +1,12 @@
using System.Xml.Linq;
using System.Linq;
public class Parameters
{
public string Configuration { get; private set; }
public bool SkipTests { get; private set; }
public string MainRepo { get; private set; }
public string MasterBranch { get; private set; }
public string AssemblyInfoPath { get; private set; }
public string ReleasePlatform { get; private set; }
public string ReleaseConfiguration { get; private set; }
public string MSBuildSolution { get; private set; }
@ -44,7 +46,6 @@ public class Parameters
// CONFIGURATION
MainRepo = "AvaloniaUI/Avalonia";
MasterBranch = "master";
AssemblyInfoPath = context.File("./src/Shared/SharedAssemblyInfo.cs");
ReleaseConfiguration = "Release";
MSBuildSolution = "./dirs.proj";
@ -62,7 +63,7 @@ public class Parameters
IsMyGetRelease = !IsTagged && IsReleasable;
// VERSION
Version = context.Argument("force-nuget-version", context.ParseAssemblyInfo(AssemblyInfoPath).AssemblyVersion);
Version = context.Argument("force-nuget-version", GetVersion());
if (IsRunningOnAppVeyor)
{
@ -100,4 +101,10 @@ public class Parameters
ZipSourceControlCatalogDesktopDirs = (DirectoryPath)context.Directory("./samples/ControlCatalog.Desktop/bin/" + DirSuffix + "/net461");
ZipTargetControlCatalogDesktopDirs = ZipRoot.CombineWithFilePath("ControlCatalog.Desktop-" + FileZipSuffix);
}
private static string GetVersion()
{
var xdoc = XDocument.Load("./build/SharedVersion.props");
return xdoc.Descendants().First(x => x.Name.LocalName == "Version").Value;
}
}

19
src/Shared/SharedAssemblyInfo.cs

@ -1,19 +0,0 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
[assembly: AssemblyCompany("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCopyright("Copyright AvaloniaUI 2016")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyProduct("Avalonia")]
[assembly: AssemblyTrademark("")]
[assembly: NeutralResourcesLanguage("en")]
[assembly: AssemblyVersion("0.6.2")]
[assembly: AssemblyFileVersion("0.6.2")]
[assembly: AssemblyInformationalVersion("0.6.2")]

20
src/Shared/avalonia.platform.targets

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Includes the Avalonia platform-specific libraries in an application's output directory -->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And HasTrailingSlash('$(MSBuildThisFileDirectory)')">
<PlatformLib Include="$(MSBuildThisFileDirectory)..\Gtk\Avalonia.Cairo\bin\$(Configuration)\Avalonia.Cairo.dll" />
<PlatformLib Include="$(MSBuildThisFileDirectory)..\Gtk\Avalonia.Gtk\bin\$(Configuration)\Avalonia.Gtk.dll" />
<PlatformLib Include="$(MSBuildThisFileDirectory)..\Windows\Avalonia.Direct2D1\bin\$(Configuration)\Avalonia.Direct2D1.dll" />
<PlatformLib Include="$(MSBuildThisFileDirectory)..\Windows\Avalonia.Direct2D1\bin\$(Configuration)\SharpDX.dll" />
<PlatformLib Include="$(MSBuildThisFileDirectory)..\Windows\Avalonia.Direct2D1\bin\$(Configuration)\SharpDX.Direct2D1.dll" />
<PlatformLib Include="$(MSBuildThisFileDirectory)..\Windows\Avalonia.Direct2D1\bin\$(Configuration)\SharpDX.DXGI.dll" />
<PlatformLib Include="$(MSBuildThisFileDirectory)..\Windows\Avalonia.Win32\bin\$(Configuration)\Avalonia.Win32.dll" />
</ItemGroup>
<PropertyGroup>
<PrepareForRunDependsOn>$(PrepareForRunDependsOn);CopyPlatformLibs</PrepareForRunDependsOn>
</PropertyGroup>
<Target Name="CopyPlatformLibs">
<Copy SourceFiles="@(PlatformLib)" DestinationFolder="$(OutDir)" ContinueOnError="true"/>
</Target>
</Project>
Loading…
Cancel
Save