Skip to content

Vs2017 build #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: sparklexrm-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions SparkleXrmSamples/QuickNavigation/ClientUI/ClientUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions SparkleXrmSamples/QuoteLineEditor/ClientUI/ClientUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
66 changes: 66 additions & 0 deletions SparkleXrmSource/SparkleXrm/ES6/Promise.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;

namespace ES6
{
[Imported]
[IgnoreNamespace]
public class Promise
{
public Promise(PromiseArgs promise)
{
}

public static Promise Resolve(object value)
{
return null;
}

[ScriptName("then")]
public Promise Then(Func<object, Promise> onFulfilled)
{
return null;
}

[ScriptName("then")]
public Promise Then2(Action<object, Promise> onFulfilled, Action<Exception> onRejected)
{
return null;
}

[ScriptName("then")]
public Promise Then3(Action<object> onFulfilled)
{
return null;
}

public Promise Catch(Action<Exception> onRejected)
{
return null;
}

public static Promise Resolve(Promise promise)
{
return null;
}

public static Promise Reject(Exception error)
{
return null;
}

public static Promise All(List<Promise> all)
{
return null;
}

public static Promise Race(List<Promise> reace)
{
return null;
}
}

[Imported]
public delegate void PromiseArgs(Action<object> resolve, Action<Exception> reject);
}
1 change: 1 addition & 0 deletions SparkleXrmSource/SparkleXrmUI/SparkleXrmUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down