Added nuke build

2018-12-08 15:41:18 +01:00 · 2018-12-08 15:41:18 +01:00 · e5403389a6
--- a/.nuke
+++ b/.nuke
--- a/PackageReferenceEditor.sln
+++ b/PackageReferenceEditor.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2009
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28315.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageReferenceEditor.Avalonia", "src\PackageReferenceEditor.Avalonia\PackageReferenceEditor.Avalonia.csproj", "{C53DAAF8-7153-4B1D-8B68-A16F91AAB835}"
 EndProject
@ -14,15 +14,10 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{49F71003-4C84-42F3-A10A-6E2CA97DA1DB}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.nuke = .nuke
 		build.ps1 = build.ps1
 		build.sh = build.sh
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ci", "ci", "{39DBA083-162E-4408-8B5D-48FC05DBA14F}"
-	ProjectSection(SolutionItems) = preProject
-		_config.yml = _config.yml
-		appveyor.yml = appveyor.yml
-		azure-pipelines.yml = azure-pipelines.yml
+		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "git", "git", "{9B3906D9-4904-45D0-B183-C8A1742D89A0}"
@ -40,7 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{B8ACA4FA
 	ProjectSection(SolutionItems) = preProject
 		build\Avalonia.Desktop.props = build\Avalonia.Desktop.props
 		build\Avalonia.props = build\Avalonia.props
-		build\NETCore.props = build\NETCore.props
+		build\Base.props = build\Base.props
+		build\EmbedXaml.props = build\EmbedXaml.props
 		build\Newtonsoft.Json.props = build\Newtonsoft.Json.props
 		build\Rx.props = build\Rx.props
 	EndProjectSection
@ -51,6 +47,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{8A8848E4-0
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\build\_build.csproj", "{41CB9D2A-BCCC-4227-A9B9-6757FDD0E0B6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -65,6 +63,10 @@ Global
 		{71EE73A0-FE62-4978-8F0D-140A8A72A1F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{71EE73A0-FE62-4978-8F0D-140A8A72A1F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{71EE73A0-FE62-4978-8F0D-140A8A72A1F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41CB9D2A-BCCC-4227-A9B9-6757FDD0E0B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41CB9D2A-BCCC-4227-A9B9-6757FDD0E0B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41CB9D2A-BCCC-4227-A9B9-6757FDD0E0B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41CB9D2A-BCCC-4227-A9B9-6757FDD0E0B6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -72,11 +74,10 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{C53DAAF8-7153-4B1D-8B68-A16F91AAB835} = {5B7FC42E-07EA-474F-8B8C-DAD199066922}
 		{71EE73A0-FE62-4978-8F0D-140A8A72A1F1} = {73210E6A-03C8-4FA2-8A8E-BF72B3E934C0}
-		{39DBA083-162E-4408-8B5D-48FC05DBA14F} = {49F71003-4C84-42F3-A10A-6E2CA97DA1DB}
 		{9B3906D9-4904-45D0-B183-C8A1742D89A0} = {49F71003-4C84-42F3-A10A-6E2CA97DA1DB}
 		{51951E55-3B76-47D8-8E62-6E01E3F5DEAD} = {49F71003-4C84-42F3-A10A-6E2CA97DA1DB}
 		{B8ACA4FA-8593-4605-AE54-E047FB91C176} = {49F71003-4C84-42F3-A10A-6E2CA97DA1DB}
-		{8A8848E4-0FF5-45C2-84AF-4B9A0F6172C3} = {49F71003-4C84-42F3-A10A-6E2CA97DA1DB}
+		{41CB9D2A-BCCC-4227-A9B9-6757FDD0E0B6} = {49F71003-4C84-42F3-A10A-6E2CA97DA1DB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {33B60D57-896D-43D2-A23B-244BADB28D81}
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,18 +0,0 @@
-version: '{build}'
-image: Visual Studio 2017
-skip_branch_with_pr: true
-environment:
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-build_script:
- ps: .\build.ps1
-test: off
-deploy: off
-artifacts:
- path: src\PackageReferenceEditor.Avalonia\bin\win7-x64
-  name: PackageReferenceEditor.Avalonia-win7-x64
- path: src\PackageReferenceEditor.Avalonia\bin\ubuntu.14.04-x64
-  name: PackageReferenceEditor.Avalonia-ubuntu.14.04-x64
- path: src\PackageReferenceEditor.Avalonia\bin\osx.10.12-x64
-  name: PackageReferenceEditor.Avalonia-osx.10.12-x64
- path: src\PackageReferenceEditor\bin\Release\*.nupkg
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@ -1,47 +0,0 @@
-jobs:
- job: Linux
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DotNetCoreInstaller@0
-    inputs:
-      version: '2.1.500'
-  - bash: ./build.sh
-    env:
-      COREHOST_TRACE: 0
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-      DOTNET_CLI_TELEMETRY_OPTOUT: 1
- job: macOS
-  pool:
-    vmImage: 'xcode9-macos10.13'
-  steps:
-  - task: DotNetCoreInstaller@0
-    inputs:
-      version: '2.1.500'
-  - bash: ./build.sh
-    env:
-      COREHOST_TRACE: 0
-      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-      DOTNET_CLI_TELEMETRY_OPTOUT: 1
- job: Windows
-  pool:
-    vmImage: 'vs2017-win2016'
-  variables:
-    solution: '**/*.sln'
-    buildPlatform: 'Any CPU'
-    buildConfiguration: 'Release'
-  steps:
-  - task: DotNetCoreInstaller@0
-    inputs:
-      version: '2.1.500'
-  - task: NuGetToolInstaller@0
-  - task: NuGetCommand@2
-    inputs:
-      restoreSolution: '$(solution)'
-      feedsToUse: 'config'
-      nugetConfigPath: 'NuGet.Config'
-  - task: VSBuild@1
-    inputs:
-      solution: '$(solution)'
-      platform: '$(buildPlatform)'
-      configuration: '$(buildConfiguration)'
--- a/build.ps1
+++ b/build.ps1
@ -1,14 +1,69 @@
-dotnet restore src/PackageReferenceEditor
-dotnet build src/PackageReferenceEditor/PackageReferenceEditor.csproj -c Release -f netstandard2.0
-dotnet pack src/PackageReferenceEditor/PackageReferenceEditor.csproj -c Release
+[CmdletBinding()]
+Param(
+    #[switch]$CustomParam,
+    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
+    [string[]]$BuildArguments
+)

-dotnet restore src/PackageReferenceEditor.Avalonia
-dotnet build src/PackageReferenceEditor.Avalonia/PackageReferenceEditor.Avalonia.csproj -c Release -f netcoreapp2.0
+Write-Output "Windows PowerShell $($Host.Version)"

-dotnet publish src/PackageReferenceEditor.Avalonia/PackageReferenceEditor.Avalonia.csproj -c Release -f netcoreapp2.0 -r win7-x64 -o bin/win7-x64
-Copy-Item "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\msvcp140.dll" src/PackageReferenceEditor.Avalonia/bin/win7-x64
-Copy-Item "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT\vcruntime140.dll" src/PackageReferenceEditor.Avalonia/bin/win7-x64
-& "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.15.26726\bin\HostX86\x86\editbin.exe" /subsystem:windows src/PackageReferenceEditor.Avalonia/bin/win7-x64/PackageReferenceEditor.Avalonia.exe
+Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { exit 1 }
+$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent

-dotnet publish src/PackageReferenceEditor.Avalonia/PackageReferenceEditor.Avalonia.csproj -c Release -f netcoreapp2.0 -r ubuntu.14.04-x64 -o bin/ubuntu.14.04-x64
-dotnet publish src/PackageReferenceEditor.Avalonia/PackageReferenceEditor.Avalonia.csproj -c Release -f netcoreapp2.0 -r osx.10.12-x64 -o bin/osx.10.12-x64
+###########################################################################
+# CONFIGURATION
+###########################################################################
+
+$BuildProjectFile = "$PSScriptRoot\build\build\_build.csproj"
+$TempDirectory = "$PSScriptRoot\\.tmp"
+
+$DotNetGlobalFile = "$PSScriptRoot\\global.json"
+$DotNetInstallUrl = "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1"
+$DotNetChannel = "Current"
+
+$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
+$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
+$env:NUGET_XMLDOC_MODE = "skip"
+
+###########################################################################
+# EXECUTION
+###########################################################################
+
+function ExecSafe([scriptblock] $cmd) {
+    & $cmd
+    if ($LASTEXITCODE) { exit $LASTEXITCODE }
+}
+
+# If global.json exists, load expected version
+if (Test-Path $DotNetGlobalFile) {
+    $DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
+    if ($DotNetGlobal.PSObject.Properties["sdk"] -and $DotNetGlobal.sdk.PSObject.Properties["version"]) {
+        $DotNetVersion = $DotNetGlobal.sdk.version
+    }
+}
+
+# If dotnet is installed locally, and expected version is not set or installation matches the expected version
+if ((Get-Command "dotnet" -ErrorAction SilentlyContinue) -ne $null -and `
+     (!(Test-Path variable:DotNetVersion) -or $(& dotnet --version) -eq $DotNetVersion)) {
+    $env:DOTNET_EXE = (Get-Command "dotnet").Path
+}
+else {
+    $DotNetDirectory = "$TempDirectory\dotnet-win"
+    $env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
+
+    # Download install script
+    $DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
+    md -force $TempDirectory > $null
+    (New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
+
+    # Install by channel or version
+    if (!(Test-Path variable:DotNetVersion)) {
+        ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
+    } else {
+        ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
+    }
+}
+
+Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
+
+ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile -- $BuildArguments }
--- a/build.sh
+++ b/build.sh
@ -1,6 +1,72 @@
 #!/usr/bin/env bash
-dotnet restore src/PackageReferenceEditor
-dotnet build src/PackageReferenceEditor/PackageReferenceEditor.csproj -c Release -f netstandard2.0

-dotnet restore src/PackageReferenceEditor.Avalonia
-dotnet build src/PackageReferenceEditor.Avalonia/PackageReferenceEditor.Avalonia.csproj -c Release -f netcoreapp2.0
+echo $(bash --version 2>&1 | head -n 1)
+
+#CUSTOMPARAM=0
+BUILD_ARGUMENTS=()
+for i in "$@"; do
+    case $(echo $1 | awk '{print tolower($0)}') in
+        # -custom-param) CUSTOMPARAM=1;;
+        *) BUILD_ARGUMENTS+=("$1") ;;
+    esac
+    shift
+done
+
+set -eo pipefail
+SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
+
+###########################################################################
+# CONFIGURATION
+###########################################################################
+
+BUILD_PROJECT_FILE="$SCRIPT_DIR/build/build/_build.csproj"
+TEMP_DIRECTORY="$SCRIPT_DIR//.tmp"
+
+DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
+DOTNET_INSTALL_URL="https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh"
+DOTNET_CHANNEL="Current"
+
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export NUGET_XMLDOC_MODE="skip"
+
+###########################################################################
+# EXECUTION
+###########################################################################
+
+function FirstJsonValue {
+    perl -nle 'print $1 if m{"'$1'": "([^"\-]+)",?}' <<< ${@:2}
+}
+
+# If global.json exists, load expected version
+if [ -f "$DOTNET_GLOBAL_FILE" ]; then
+    DOTNET_VERSION=$(FirstJsonValue "version" $(cat "$DOTNET_GLOBAL_FILE"))
+    if [ "$DOTNET_VERSION" == ""  ]; then
+        unset DOTNET_VERSION
+    fi
+fi
+
+# If dotnet is installed locally, and expected version is not set or installation matches the expected version
+if [[ -x "$(command -v dotnet)" && (-z ${DOTNET_VERSION+x} || $(dotnet --version) == "$DOTNET_VERSION") ]]; then
+    export DOTNET_EXE="$(command -v dotnet)"
+else
+    DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
+    export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
+    
+    # Download install script
+    DOTNET_INSTALL_FILE="$TEMP_DIRECTORY/dotnet-install.sh"
+    mkdir -p "$TEMP_DIRECTORY"
+    curl -Lsfo "$DOTNET_INSTALL_FILE" "$DOTNET_INSTALL_URL"
+    chmod +x "$DOTNET_INSTALL_FILE"
+    
+    # Install by channel or version
+    if [ -z ${DOTNET_VERSION+x} ]; then
+        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --channel "$DOTNET_CHANNEL" --no-path
+    else
+        "$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
+    fi
+fi
+
+echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
+
+"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" -- ${BUILD_ARGUMENTS[@]}
--- a/build/Base.props
+++ b/build/Base.props
@ -0,0 +1,11 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VersionPrefix>0.0.8</VersionPrefix>
+    <VersionSuffix></VersionSuffix>
+    <Authors>Wiesław Šoltés</Authors>
+    <Company>Wiesław Šoltés</Company>
+    <Copyright>Copyright © Wiesław Šoltés 2018</Copyright>
+    <PackageLicenseUrl>https://github.com/wieslawsoltes/PackageReferenceEditor/blob/master/LICENSE.TXT</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/wieslawsoltes/PackageReferenceEditor</PackageProjectUrl>
+  </PropertyGroup>
+</Project>
--- a/build/EmbedXaml.props
+++ b/build/EmbedXaml.props
@ -0,0 +1,11 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <EmbeddedResource Include="**\*.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+</Project>
--- a/build/NETCore.props
+++ b/build/NETCore.props
@ -1,6 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Runtime.CoreCLR" Version="2.0.8" />
-    <PackageReference Include="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.5" />
-  </ItemGroup>
-</Project>
--- a/build/build/Build.cs
+++ b/build/build/Build.cs
@ -0,0 +1,117 @@
+using System;
+using System.Linq;
+using Nuke.Common;
+using Nuke.Common.Git;
+using Nuke.Common.ProjectModel;
+using Nuke.Common.Tools.DotNet;
+using static Nuke.Common.EnvironmentInfo;
+using static Nuke.Common.IO.FileSystemTasks;
+using static Nuke.Common.IO.PathConstruction;
+using static Nuke.Common.Tools.DotNet.DotNetTasks;
+
+class Build : NukeBuild
+{
+    public static int Main() => Execute<Build>(x => x.Compile);
+
+    [Solution("PackageReferenceEditor.sln")]
+    readonly Solution Solution;
+
+    [GitRepository]
+    readonly GitRepository GitRepository;
+
+    [Parameter("configuration")]
+    public string Configuration { get; set; }
+
+    [Parameter("version-suffix")]
+    public string VersionSuffix { get; set; }
+
+    [Parameter("publish-framework")]
+    public string PublishFramework { get; set; }
+
+    [Parameter("publish-runtime")]
+    public string PublishRuntime { get; set; }
+
+    [Parameter("publish-project")]
+    public string PublishProject { get; set; }
+
+    AbsolutePath SourceDirectory => RootDirectory / "src";
+
+    AbsolutePath TestsDirectory => RootDirectory / "tests";
+
+    AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
+
+    protected override void OnBuildInitialized()
+    {
+        Configuration = Configuration ?? "Release";
+        VersionSuffix = VersionSuffix ?? "";
+    }
+
+    Target Clean => _ => _
+        .Executes(() =>
+        {
+            DeleteDirectories(GlobDirectories(SourceDirectory, "**/bin", "**/obj"));
+            DeleteDirectories(GlobDirectories(TestsDirectory, "**/bin", "**/obj"));
+            EnsureCleanDirectory(ArtifactsDirectory);
+        });
+
+    Target Restore => _ => _
+        .DependsOn(Clean)
+        .Executes(() =>
+        {
+            DotNetRestore(s => s
+                .SetProjectFile(Solution));
+        });
+
+    Target Compile => _ => _
+        .DependsOn(Restore)
+        .Executes(() =>
+        {
+            DotNetBuild(s => s
+                .SetProjectFile(Solution)
+                .SetConfiguration(Configuration)
+                .SetVersionSuffix(VersionSuffix)
+                .EnableNoRestore());
+        });
+
+    Target Test => _ => _
+        .DependsOn(Compile)
+        .Executes(() =>
+        {
+            DotNetTest(s => s
+                .SetProjectFile(Solution)
+                .SetConfiguration(Configuration)
+                .SetLogger("trx")
+                .SetResultsDirectory(ArtifactsDirectory / "TestResults")
+                .EnableNoBuild()
+                .EnableNoRestore());
+        });
+
+    Target Pack => _ => _
+        .DependsOn(Test)
+        .Executes(() =>
+        {
+            DotNetPack(s => s
+                .SetProject(Solution)
+                .SetConfiguration(Configuration)
+                .SetVersionSuffix(VersionSuffix)
+                .SetOutputDirectory(ArtifactsDirectory / "NuGet")
+                .EnableNoBuild()
+                .EnableNoRestore());
+        });
+
+    Target Publish => _ => _
+        .DependsOn(Test)
+        .Requires(() => PublishRuntime)
+        .Requires(() => PublishFramework)
+        .Requires(() => PublishProject)
+        .Executes(() =>
+        {
+            DotNetPublish(s => s
+                .SetProject(Solution.GetProject(PublishProject))
+                .SetConfiguration(Configuration)
+                .SetVersionSuffix(VersionSuffix)
+                .SetFramework(PublishFramework)
+                .SetRuntime(PublishRuntime)
+                .SetOutput(ArtifactsDirectory / "Publish" / PublishProject + "-" + PublishRuntime));
+        });
+}
--- a/build/build/_build.csproj
+++ b/build/build/_build.csproj
@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <RootNamespace></RootNamespace>
+    <IsPackable>False</IsPackable>
+    <NoWarn>CS0649;CS0169</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nuke.Common" Version="0.12.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
+    <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
+    <None Remove="*.ref;*.txt" />
+  </ItemGroup>
+
+</Project>
--- a/src/PackageReferenceEditor.Avalonia/PackageReferenceEditor.Avalonia.csproj
+++ b/src/PackageReferenceEditor.Avalonia/PackageReferenceEditor.Avalonia.csproj
@ -2,30 +2,27 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64;osx.10.12-x64</RuntimeIdentifiers>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
-    <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
+    <IsPackable>False</IsPackable>
  </PropertyGroup>

+  <PropertyGroup>
+    <Description>MSBuild, csproj and props package reference editor.</Description>
+  </PropertyGroup>
+
+  <Import Project="..\..\build\Base.props" />
+  <Import Project="..\..\build\Rx.props" />
+  <Import Project="..\..\build\Avalonia.props" />
+  <Import Project="..\..\build\Avalonia.Desktop.props" />
+  <Import Project="..\..\build\Newtonsoft.Json.props" />
+
  <ItemGroup>
    <Compile Include="**\*.cs" Exclude="obj\**" />
  </ItemGroup>

-  <ItemGroup>
-    <Compile Update="**\*.xaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="**\*.xaml" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\NETCore.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Rx.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Avalonia.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Avalonia.Desktop.props" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Newtonsoft.Json.props" />
+  <Import Project="..\..\build\EmbedXaml.props" />

  <ItemGroup>
    <ProjectReference Include="..\PackageReferenceEditor\PackageReferenceEditor.csproj" />
--- a/src/PackageReferenceEditor.Avalonia/Properties/AssemblyInfo.cs
+++ b/src/PackageReferenceEditor.Avalonia/Properties/AssemblyInfo.cs
@ -1,12 +0,0 @@
-using System.Reflection;
-
-[assembly: AssemblyTitle("PackageReferenceEditor.Avalonia")]
-[assembly: AssemblyDescription("MSBuild, csproj and props package reference editor.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Wiesław Šoltés")]
-[assembly: AssemblyProduct("PackageReferenceEditor.Avalonia")]
-[assembly: AssemblyCopyright("Copyright © Wiesław Šoltés 2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("0.0.4")]
-[assembly: AssemblyFileVersion("0.0.4")]
--- a/src/PackageReferenceEditor/PackageReferenceEditor.csproj
+++ b/src/PackageReferenceEditor/PackageReferenceEditor.csproj
@ -1,26 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
    <OutputType>Library</OutputType>
    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
  </PropertyGroup>

  <PropertyGroup>
-    <Version>0.0.7</Version>
-    <Authors>Wiesław Šoltés</Authors>
-    <Company>Wiesław Šoltés</Company>
    <Description>MSBuild, csproj and props package reference editor.</Description>
-    <Copyright>Copyright © Wiesław Šoltés 2018</Copyright>
-    <PackageLicenseUrl>https://github.com/wieslawsoltes/PackageReferenceEditor/blob/master/LICENSE.TXT</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/wieslawsoltes/PackageReferenceEditor</PackageProjectUrl>
    <PackageTags>msbuild;props;csproj;packagereference;nuget;editor</PackageTags>
  </PropertyGroup>

-  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\..\build\Newtonsoft.Json.props" />
+  <Import Project="..\..\build\Base.props" />
+  <Import Project="..\..\build\Newtonsoft.Json.props" />

 </Project>