From 20f151d9ac01b050e7f9be9479240931b6bbbb6f Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Wed, 29 Jul 2020 15:59:11 +0200
Subject: [PATCH] fix build

---
 build.cake                                         |  1 +
 sign.cake                                          |  2 +-
 src/Directory.build.props                          |  4 ++--
 src/Directory.build.targets                        | 14 ++++++++++++++
 .../Directory.build.targets                        |  7 -------
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/build.cake b/build.cake
index ad380961..f125ace5 100644
--- a/build.cake
+++ b/build.cake
@@ -127,6 +127,7 @@ Task("Build")
             .WithProperty("AssemblyVersion", gitVersion.AssemblySemVer)
             .WithProperty("FileVersion", gitVersion.AssemblySemFileVer)
             .WithProperty("InformationalVersion", gitVersion.InformationalVersion)
+            .WithProperty("ContinuousIntegrationBuild", isReleaseBranch ? "true" : "false")
             );
 });
 
diff --git a/sign.cake b/sign.cake
index 66ece3aa..c01aba97 100644
--- a/sign.cake
+++ b/sign.cake
@@ -1,5 +1,5 @@
 #module nuget:?package=Cake.DotNetTool.Module
-#tool "dotnet:?package=NuGetKeyVaultSignTool&version=3.0.3"
+#tool "dotnet:?package=NuGetKeyVaultSignTool&version=2.0.2"
 #tool "dotnet:?package=AzureSignTool&version=2.0.17"
 
 void SignFiles(IEnumerable<FilePath> files, string description, string repoUrl)
diff --git a/src/Directory.build.props b/src/Directory.build.props
index ec2fbcad..221cfe63 100644
--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -46,8 +46,8 @@
 
     <!-- Add the references for all projects and targets -->
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2019.*" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" IncludeAssets="build; native" />
+        <PackageReference Include="JetBrains.Annotations" Version="2020.*" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All"/>
         <!-- <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" PrivateAssets="All" Condition=" $(TargetFramework.StartsWith('uap')) " /> -->
     </ItemGroup>
 
diff --git a/src/Directory.build.targets b/src/Directory.build.targets
index ca57b9dd..5a13612b 100644
--- a/src/Directory.build.targets
+++ b/src/Directory.build.targets
@@ -21,6 +21,20 @@
         <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     </PropertyGroup>
 
+    <!-- Workaround. Remove once we're on 3.1.300+
+    https://github.com/dotnet/sourcelink/issues/572 -->
+    <PropertyGroup>
+        <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
+    </PropertyGroup>
+    <ItemGroup>
+        <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+    </ItemGroup>
+
+    <!-- Workaround for https://github.com/dotnet/sdk/issues/11105 -->
+    <ItemGroup>
+        <SourceRoot Include="$(NuGetPackageRoot)" Condition="'$(NuGetPackageRoot)' != ''" />
+    </ItemGroup>
+
     <ItemGroup>
         <Page Update="@(Page)" SubType="Designer" Generator="MSBuild:Compile" />
     </ItemGroup>
diff --git a/src/MahApps.Metro.IconPacks/Directory.build.targets b/src/MahApps.Metro.IconPacks/Directory.build.targets
index 2e5a76cc..1c950986 100644
--- a/src/MahApps.Metro.IconPacks/Directory.build.targets
+++ b/src/MahApps.Metro.IconPacks/Directory.build.targets
@@ -19,12 +19,5 @@
         <RepositoryType>git</RepositoryType>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
-    </PropertyGroup>
-    <ItemGroup>
-        <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
-    </ItemGroup>
-
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 </Project>
\ No newline at end of file