Merge branch 'master' of https://github.com/scottdurow/SparkleXrm

scottdurow · Jul 10, 2018 · fa61048 · fa61048
2 parents 6a71d19 + 1fe0444
commit fa61048
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/SparkleXrmSamples/SparkleXrmTemplateVS2016DeveloperToolkit365/ClientHooks/ClientHooks.csproj b/SparkleXrmSamples/SparkleXrmTemplateVS2016DeveloperToolkit365/ClientHooks/ClientHooks.csproj
@@ -18,6 +18,7 @@
     <RestorePackages>true</RestorePackages>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+	<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\</OutputPath>

diff --git a/.../SparkleXrmTemplateVS2016DeveloperToolkit365/ClientUI.UnitTests/ClientUI.UnitTests.csproj b/.../SparkleXrmTemplateVS2016DeveloperToolkit365/ClientUI.UnitTests/ClientUI.UnitTests.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>bin\</OutputPath>

diff --git a/SparkleXrmSamples/SparkleXrmTemplateVS2016DeveloperToolkit365/ClientUI/ClientUI.csproj b/SparkleXrmSamples/SparkleXrmTemplateVS2016DeveloperToolkit365/ClientUI/ClientUI.csproj
@@ -16,6 +16,7 @@
     <GenerateResources>True</GenerateResources>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+	<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>