Skip to content

Commit b2138c7

Browse files
janis-veinbergsjanis-veinbergs
committed
Fix VS 2017 compilation for ScriptSharp.
nikhilk/scriptsharp#452
1 parent 8d7b492 commit b2138c7

File tree

17 files changed

+17
-0
lines changed

17 files changed

+17
-0
lines changed

‎SparkleXrmSamples/ConnectionsUI/ClientUI.UnitTests/ClientUI.UnitTests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<RestorePackages>true</RestorePackages>
1919
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2020
<TargetFrameworkProfile />
21+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2324
<OutputPath>bin\</OutputPath>

‎SparkleXrmSamples/MultiEntitySearch/ClientHooks/ClientHooks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
1515
<GenerateScript>True</GenerateScript>
1616
<GenerateResources>True</GenerateResources>
17+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/MultiEntitySearch/ClientUI/ClientUI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
1515
<GenerateScript>True</GenerateScript>
1616
<GenerateResources>True</GenerateResources>
17+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/QuickNavigation/ClientHooks/ClientHooks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<GenerateResources>True</GenerateResources>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/QuickNavigation/ClientUI/ClientUI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<GenerateResources>True</GenerateResources>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/QuoteLineEditor/ClientHooks/ClientHooks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<GenerateResources>True</GenerateResources>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<OutputPath>..\QuoteLineEditor\CrmPackage\WebResources\dev1_\js\</OutputPath>

‎SparkleXrmSamples/QuoteLineEditor/ClientUI/ClientUI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<GenerateResources>True</GenerateResources>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<OutputPath>..\QuoteLineEditor\CrmPackage\WebResources\dev1_\js\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplate/ClientHooks/ClientHooks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<GenerateResources>True</GenerateResources>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplate/ClientUI/ClientUI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<GenerateResources>True</GenerateResources>
1717
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1818
<RestorePackages>true</RestorePackages>
19+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientHooks/ClientHooks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<RestorePackages>true</RestorePackages>
1919
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2020
<TargetFrameworkProfile />
21+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2324
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplateCRM2015/ClientUI/ClientUI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<RestorePackages>true</RestorePackages>
1919
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2020
<TargetFrameworkProfile />
21+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2324
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientHooks/ClientHooks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<RestorePackages>true</RestorePackages>
1919
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2020
<TargetFrameworkProfile />
21+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2324
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI.UnitTests/ClientUI.UnitTests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<RestorePackages>true</RestorePackages>
1919
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2020
<TargetFrameworkProfile />
21+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2324
<OutputPath>bin\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplateCRM2015WithUnitTests/ClientUI/ClientUI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<RestorePackages>true</RestorePackages>
1919
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
2020
<TargetFrameworkProfile />
21+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
2122
</PropertyGroup>
2223
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2324
<OutputPath>..\SparkleXrmCrmPackage\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientHooks/ClientHooks.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
1515
<GenerateScript>True</GenerateScript>
1616
<GenerateResources>True</GenerateResources>
17+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<OutputPath>..\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSamples/SparkleXrmTemplateVS2015/ClientUI/ClientUI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
1515
<GenerateScript>True</GenerateScript>
1616
<GenerateResources>True</GenerateResources>
17+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<OutputPath>..\CrmPackage\WebResources\js\</OutputPath>

‎SparkleXrmSource/SparkleXrmUI/SparkleXrmUI.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
4141
<UseApplicationTrust>false</UseApplicationTrust>
4242
<BootstrapperEnabled>true</BootstrapperEnabled>
43+
<DisableHandlePackageFileConflicts>true</DisableHandlePackageFileConflicts>
4344
</PropertyGroup>
4445
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
4546
<OutputPath>bin\Debug\</OutputPath>

0 commit comments

Comments
 (0)