зеркало из https://github.com/microsoft/Angara.git
Updated versions of Angara.Chart and Angara.Table to correct ones.
This commit is contained in:
Dmitry Kats
Родитель
6bd8855347
Коммит
9e14de2617
|
|
@ -52,7 +52,8 @@ module.exports = function (grunt) {
|
|||
'svg.js/dist/*.min.js',
|
||||
'require-css/css.min.js',
|
||||
'file-saver/FileSaver.min.js',
|
||||
'jquery-mousewheel/jquery.mousewheel.js'
|
||||
'jquery-mousewheel/jquery.mousewheel.js',
|
||||
'requirejs/require.js'
|
||||
],
|
||||
dest: htmlPath+'./.Web/'
|
||||
},
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
"rx": "~4.1.0",
|
||||
"datatables.net-dt": "DataTables/DataTables#1.9.4",
|
||||
"npm-modernizr": "^2.8.3",
|
||||
"angara.chartjs": "predictionmachines/Angara.Chart#0.3.0",
|
||||
"angara.tablejs": "predictionmachines/Angara.Table#0.3.2",
|
||||
"angara.chartjs": "predictionmachines/Angara.Chart#0.3.1",
|
||||
"angara.tablejs": "predictionmachines/Angara.Table#0.3.3",
|
||||
"angara.serializationjs": "predictionmachines/Angara.Serialization#0.3.0",
|
||||
"domReady": "requirejs/domReady#^2.0.1"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ source https://nuget.org/api/v2
|
|||
nuget Angara.Serialization ~> 0.3.0
|
||||
nuget Angara.Serialization.Json ~> 0.3.0
|
||||
nuget Angara.Statistics ~> 0.1
|
||||
nuget Angara.Table ~> 0.3.2
|
||||
nuget Angara.Chart ~> 0.3.0
|
||||
nuget Angara.Table ~> 0.3.3
|
||||
nuget Angara.Chart ~> 0.3.1
|
||||
nuget System.Collections.Immutable 1.1.36
|
||||
nuget DotNetZip ~> 1.10.1
|
||||
nuget Newtonsoft.Json >= 10.0.1
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ NUGET
|
|||
Newtonsoft.Json (>= 10.0.1)
|
||||
Angara.Statistics (0.1.4)
|
||||
Angara.Serialization
|
||||
Angara.Table (0.3.2)
|
||||
Angara.Table (0.3.3)
|
||||
Angara.Serialization (>= 0.3 < 0.4)
|
||||
Angara.Statistics (>= 0.1 < 1.0)
|
||||
System.Collections.Immutable (1.1.36)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<AssemblyName>Angara.Html.Sample</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
|
||||
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
|
||||
<Name>Angara.Html.Sample</Name>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Choose>
|
||||
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
|
||||
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
|
||||
<ItemGroup>
|
||||
<Reference Include="Angara.Serialization">
|
||||
<HintPath>..\..\packages\Angara.Serialization\lib\net452\Angara.Serialization.dll</HintPath>
|
||||
|
|
@ -109,7 +109,7 @@
|
|||
</When>
|
||||
</Choose>
|
||||
<Choose>
|
||||
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
|
||||
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
|
||||
<ItemGroup>
|
||||
<Reference Include="Angara.Statistics">
|
||||
<HintPath>..\..\packages\Angara.Statistics\lib\net452\Angara.Statistics.dll</HintPath>
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
</When>
|
||||
</Choose>
|
||||
<Choose>
|
||||
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')">
|
||||
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
|
||||
<ItemGroup>
|
||||
<Reference Include="Angara.Table">
|
||||
<HintPath>..\..\packages\Angara.Table\lib\net452\Angara.Table.dll</HintPath>
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
</When>
|
||||
</Choose>
|
||||
<Choose>
|
||||
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2')) Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile259')">
|
||||
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'MonoAndroid' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v2.2' Or $(TargetFrameworkVersion) == 'v2.3' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.1' Or $(TargetFrameworkVersion) == 'v4.2' Or $(TargetFrameworkVersion) == 'v4.3' Or $(TargetFrameworkVersion) == 'v4.4' Or $(TargetFrameworkVersion) == 'v5.0' Or $(TargetFrameworkVersion) == 'v5.1' Or $(TargetFrameworkVersion) == 'v6.0' Or $(TargetFrameworkVersion) == 'v7.0' Or $(TargetFrameworkVersion) == 'v7.1' Or $(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')) Or ($(TargetFrameworkIdentifier) == '.NETCoreApp' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v2.0' Or $(TargetFrameworkVersion) == 'v2.1')) Or ($(TargetFrameworkIdentifier) == '.NETStandard' And ($(TargetFrameworkVersion) == 'v1.0' Or $(TargetFrameworkVersion) == 'v1.1' Or $(TargetFrameworkVersion) == 'v1.2' Or $(TargetFrameworkVersion) == 'v1.3' Or $(TargetFrameworkVersion) == 'v1.4' Or $(TargetFrameworkVersion) == 'v1.5' Or $(TargetFrameworkVersion) == 'v1.6' Or $(TargetFrameworkVersion) == 'v2.0')) Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile259') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkIdentifier) == 'Xamarin.tvOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.watchOS')">
|
||||
<ItemGroup>
|
||||
<Reference Include="System.Collections.Immutable">
|
||||
<HintPath>..\..\packages\System.Collections.Immutable\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
|
||||
|
|
|
|||
12
yarn.lock
12
yarn.lock
|
|
@ -22,9 +22,9 @@ ajv@^5.1.0:
|
|||
fast-json-stable-stringify "^2.0.0"
|
||||
json-schema-traverse "^0.3.0"
|
||||
|
||||
angara.chartjs@predictionmachines/Angara.Chart#0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://codeload.github.com/predictionmachines/Angara.Chart/tar.gz/1e7bdabac2857945d268a67d8ca1a9eef15a3ffb"
|
||||
angara.chartjs@predictionmachines/Angara.Chart#0.3.1:
|
||||
version "0.3.1"
|
||||
resolved "https://codeload.github.com/predictionmachines/Angara.Chart/tar.gz/dc0135639c105185a9a78b77b158eb29ef4ddfee"
|
||||
dependencies:
|
||||
interactive-data-display "^1.5.4"
|
||||
jquery "~2.1.4"
|
||||
|
|
@ -37,9 +37,9 @@ angara.serializationjs@predictionmachines/Angara.Serialization#0.3.0:
|
|||
version "0.3.0"
|
||||
resolved "https://codeload.github.com/predictionmachines/Angara.Serialization/tar.gz/62ea60e957f2bd23596a8000c8b58c39251ff605"
|
||||
|
||||
angara.tablejs@predictionmachines/Angara.Table#0.3.2:
|
||||
version "0.3.2"
|
||||
resolved "https://codeload.github.com/predictionmachines/Angara.Table/tar.gz/29aa010b0932edb1c4671529d632cdcc9ea8f526"
|
||||
angara.tablejs@predictionmachines/Angara.Table#0.3.3:
|
||||
version "0.3.3"
|
||||
resolved "https://codeload.github.com/predictionmachines/Angara.Table/tar.gz/61e808c5ed2dcd46ae361cadec6e17ed9043ca6d"
|
||||
dependencies:
|
||||
datatables.net-dt DataTables/DataTables#1.9.4
|
||||
interactive-data-display "^1.5.3"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче