From 8840cd5debfabf0556d9f9acea7097999f6d6b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=81nis=20Veinbergs?= <jveinbergs@deac.eu>
Date: Wed, 13 Nov 2019 10:30:32 +0200
Subject: [PATCH] Fix VS 2017 compilation for ScriptSharp.
 https://github.com/nikhilk/scriptsharp/issues/452

---
 .../ConnectionsUI/ClientUI.UnitTests/ClientUI.UnitTests.csproj   | 1 +
 .../MultiEntitySearch/ClientHooks/ClientHooks.csproj             | 1 +
 SparkleXrmSamples/MultiEntitySearch/ClientUI/ClientUI.csproj     | 1 +
 SparkleXrmSamples/QuickNavigation/ClientHooks/ClientHooks.csproj | 1 +
 SparkleXrmSamples/QuickNavigation/ClientUI/ClientUI.csproj       | 1 +
 SparkleXrmSamples/QuoteLineEditor/ClientHooks/ClientHooks.csproj | 1 +
 SparkleXrmSamples/QuoteLineEditor/ClientUI/ClientUI.csproj       | 1 +
 .../SparkleXrmTemplate/ClientHooks/ClientHooks.csproj            | 1 +
 SparkleXrmSamples/SparkleXrmTemplate/ClientUI/ClientUI.csproj    | 1 +
 .../SparkleXrmTemplateCRM2015/ClientHooks/ClientHooks.csproj     | 1 +
 .../SparkleXrmTemplateCRM2015/ClientUI/ClientUI.csproj           | 1 +
 .../ClientHooks/ClientHooks.csproj                               | 1 +
 .../ClientUI.UnitTests/ClientUI.UnitTests.csproj                 | 1 +
 .../ClientUI/ClientUI.csproj                                     | 1 +
 .../SparkleXrmTemplateVS2015/ClientHooks/ClientHooks.csproj      | 1 +
 .../SparkleXrmTemplateVS2015/ClientUI/ClientUI.csproj            | 1 +
 SparkleXrmSource/SparkleXrmUI/SparkleXrmUI.csproj                | 1 +
 17 files changed, 17 insertions(+)

diff --git a/SparkleXrmSamples/ConnectionsUI/ClientUI.UnitTests/ClientUI.UnitTests.csproj b/SparkleXrmSamples/ConnectionsUI/ClientUI.UnitTests/ClientUI.UnitTests.csproj
index 7c5c8931..b407ed74 100644
--- a/SparkleXrmSamples/ConnectionsUI/ClientUI.UnitTests/ClientUI.UnitTests.csproj
+++ b/SparkleXrmSamples/ConnectionsUI/ClientUI.UnitTests/ClientUI.UnitTests.csproj
@@ -18,6 +18,7 @@
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\</OutputPath>
diff --git a/SparkleXrmSamples/MultiEntitySearch/ClientHooks/ClientHooks.csproj b/SparkleXrmSamples/MultiEntitySearch/ClientHooks/ClientHooks.csproj
index 66b48a47..cb639b0e 100644
--- a/SparkleXrmSamples/MultiEntitySearch/ClientHooks/ClientHooks.csproj
+++ b/SparkleXrmSamples/MultiEntitySearch/ClientHooks/ClientHooks.csproj
@@ -14,6 +14,7 @@
     <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
+	<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/MultiEntitySearch/ClientUI/ClientUI.csproj b/SparkleXrmSamples/MultiEntitySearch/ClientUI/ClientUI.csproj
index 96da1cad..998aed09 100644
--- a/SparkleXrmSamples/MultiEntitySearch/ClientUI/ClientUI.csproj
+++ b/SparkleXrmSamples/MultiEntitySearch/ClientUI/ClientUI.csproj
@@ -14,6 +14,7 @@
     <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/QuickNavigation/ClientHooks/ClientHooks.csproj b/SparkleXrmSamples/QuickNavigation/ClientHooks/ClientHooks.csproj
index 3bd5a6cb..914b2baa 100644
--- a/SparkleXrmSamples/QuickNavigation/ClientHooks/ClientHooks.csproj
+++ b/SparkleXrmSamples/QuickNavigation/ClientHooks/ClientHooks.csproj
@@ -16,6 +16,7 @@
     <GenerateResources>True</GenerateResources>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/QuickNavigation/ClientUI/ClientUI.csproj b/SparkleXrmSamples/QuickNavigation/ClientUI/ClientUI.csproj
index 5d21ba5d..5fd34c1b 100644
--- a/SparkleXrmSamples/QuickNavigation/ClientUI/ClientUI.csproj
+++ b/SparkleXrmSamples/QuickNavigation/ClientUI/ClientUI.csproj
@@ -16,6 +16,7 @@
     <GenerateResources>True</GenerateResources>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/QuoteLineEditor/ClientHooks/ClientHooks.csproj b/SparkleXrmSamples/QuoteLineEditor/ClientHooks/ClientHooks.csproj
index 270a4319..ae89548c 100644
--- a/SparkleXrmSamples/QuoteLineEditor/ClientHooks/ClientHooks.csproj
+++ b/SparkleXrmSamples/QuoteLineEditor/ClientHooks/ClientHooks.csproj
@@ -16,6 +16,7 @@
     <GenerateResources>True</GenerateResources>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\QuoteLineEditor\CrmPackage\WebResources\dev1_\js\</OutputPath>
diff --git a/SparkleXrmSamples/QuoteLineEditor/ClientUI/ClientUI.csproj b/SparkleXrmSamples/QuoteLineEditor/ClientUI/ClientUI.csproj
index 57178668..254aa38e 100644
--- a/SparkleXrmSamples/QuoteLineEditor/ClientUI/ClientUI.csproj
+++ b/SparkleXrmSamples/QuoteLineEditor/ClientUI/ClientUI.csproj
@@ -16,6 +16,7 @@
     <GenerateResources>True</GenerateResources>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\QuoteLineEditor\CrmPackage\WebResources\dev1_\js\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplate/ClientHooks/ClientHooks.csproj b/SparkleXrmSamples/SparkleXrmTemplate/ClientHooks/ClientHooks.csproj
index e738de2b..a9fc0690 100644
--- a/SparkleXrmSamples/SparkleXrmTemplate/ClientHooks/ClientHooks.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplate/ClientHooks/ClientHooks.csproj
@@ -16,6 +16,7 @@
     <GenerateResources>True</GenerateResources>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplate/ClientUI/ClientUI.csproj b/SparkleXrmSamples/SparkleXrmTemplate/ClientUI/ClientUI.csproj
index 9c3ecafd..d4e4434b 100644
--- a/SparkleXrmSamples/SparkleXrmTemplate/ClientUI/ClientUI.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplate/ClientUI/ClientUI.csproj
@@ -16,6 +16,7 @@
     <GenerateResources>True</GenerateResources>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientHooks/ClientHooks.csproj b/SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientHooks/ClientHooks.csproj
index e3d82f93..22b32764 100644
--- a/SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientHooks/ClientHooks.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientHooks/ClientHooks.csproj
@@ -18,6 +18,7 @@
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientUI/ClientUI.csproj b/SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientUI/ClientUI.csproj
index 931cb502..919087f6 100644
--- a/SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientUI/ClientUI.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientUI/ClientUI.csproj
@@ -18,6 +18,7 @@
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientHooks/ClientHooks.csproj b/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientHooks/ClientHooks.csproj
index 0d7bf360..2f25d38f 100644
--- a/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientHooks/ClientHooks.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientHooks/ClientHooks.csproj
@@ -18,6 +18,7 @@
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI.UnitTests/ClientUI.UnitTests.csproj b/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI.UnitTests/ClientUI.UnitTests.csproj
index d0ecb0d3..5ed9b786 100644
--- a/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI.UnitTests/ClientUI.UnitTests.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI.UnitTests/ClientUI.UnitTests.csproj
@@ -18,6 +18,7 @@
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI/ClientUI.csproj b/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI/ClientUI.csproj
index c0a7be83..2dc8e491 100644
--- a/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI/ClientUI.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI/ClientUI.csproj
@@ -18,6 +18,7 @@
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientHooks/ClientHooks.csproj b/SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientHooks/ClientHooks.csproj
index 43af8f46..f59a935c 100644
--- a/SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientHooks/ClientHooks.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientHooks/ClientHooks.csproj
@@ -14,6 +14,7 @@
     <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientUI/ClientUI.csproj b/SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientUI/ClientUI.csproj
index 4cb05262..027abc23 100644
--- a/SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientUI/ClientUI.csproj
+++ b/SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientUI/ClientUI.csproj
@@ -14,6 +14,7 @@
     <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
     <GenerateScript>True</GenerateScript>
     <GenerateResources>True</GenerateResources>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\CrmPackage\WebResources\js\</OutputPath>
diff --git a/SparkleXrmSource/SparkleXrmUI/SparkleXrmUI.csproj b/SparkleXrmSource/SparkleXrmUI/SparkleXrmUI.csproj
index 87f4a2be..fd89c5f4 100644
--- a/SparkleXrmSource/SparkleXrmUI/SparkleXrmUI.csproj
+++ b/SparkleXrmSource/SparkleXrmUI/SparkleXrmUI.csproj
@@ -40,6 +40,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>