Skip to content

Commit

Permalink
Merge pull request #1258 from mortend/dependencies
Browse files Browse the repository at this point in the history
Fix dependency downloads
  • Loading branch information
mortend authored Mar 10, 2019
2 parents cdd4e79 + 6fbdb0f commit aee40d2
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ environment:

install:
- npm install
- ps: Invoke-WebRequest https://files.fusetools.com/tooling/iyVp8kwQ0vLn-mesa-17.2.3.500.zip -OutFile mesa.zip
- ps: Invoke-WebRequest https://www.nuget.org/api/v2/package/mesa3d-x64/18.3.4 -OutFile mesa.zip
- ps: Expand-Archive mesa.zip mesa

build_script:
Expand All @@ -19,7 +19,7 @@ before_test:
Get-ChildItem -Path Source -Recurse -Include *Test.unoproj | Select-Object -ExpandProperty DirectoryName | Foreach-Object {
$buildDir = Join-Path $_ build\Test\DotNet
New-Item -Force -ItemType directory -Path $buildDir | Out-Null
Copy-Item -Path mesa\x64\opengl32.dll -Destination (Join-Path $buildDir opengl32.dll)
Copy-Item -Path mesa\opengl32.dll -Destination (Join-Path $buildDir opengl32.dll)
}
test_script:
Expand Down
2 changes: 1 addition & 1 deletion Source/Fuse.Common/Internal/DesktopFonts.stuff
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if !Android && !iOS {
/* 22.41MB */ DesktopFonts: "https://files.fusetools.com/tooling/xuTuMXgNyKMr-DesktopFonts.zip"
/* 22.41MB */ DesktopFonts: "https://www.nuget.org/api/v2/package/fuselibs-desktop-fonts/1.0.0"
}
2 changes: 1 addition & 1 deletion Source/Fuse.Controls.Video/CIL/XamMac.stuff
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/* 4.28MB */ XamMac: "https://files.fusetools.com/tooling/5xfgNKhw1lmr-XamMac.zip"
/* 4.28MB */ XamMac: "https://www.nuget.org/api/v2/package/FuseOpen.Xamarin.Mac/3.4.0.2"
2 changes: 1 addition & 1 deletion Source/Fuse.Elements/Tests/UX/ImageFill.UrlResource.ux
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Rectangle ux:Class="UX.ImageFill.UrlResource">
<WhileLoading ux:Name="W"/>
<ImageFill Url="https://files.fusetools.com/tooling/HlbWfEK6rfwk-fuselibs_unittest_green.png" MemoryPolicy="UnloadUnused" StretchMode="PixelPrecise" ux:Name="IF"/>
<ImageFill Url="https://github.com/fuse-open/uno/raw/16dbc35b9417c4d9e9d054a275fdbfd2827bc92b/lib/UnoCore/Assets/DefaultIcon.png" MemoryPolicy="UnloadUnused" StretchMode="PixelPrecise" ux:Name="IF"/>
</Rectangle>
3 changes: 1 addition & 2 deletions Source/Fuse.Scripting.JavaScript/V8/V8Simple.cil.uxl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
<Require Condition="HOST_MAC" UnmanagedLibrary="lib/OSX/libV8Simple.dylib" />
<Require Condition="HOST_MAC" Assembly="lib/OSX/V8Simple.net.dll" />
<Require Condition="HOST_WIN32" Assembly="lib/DotNet/V8Simple.net.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary.x86="lib/Windows/x86/V8Simple.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary.x64="lib/Windows/x64/V8Simple.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary="lib/Windows/V8Simple.dll" />
</Extensions>
2 changes: 1 addition & 1 deletion Source/Fuse.Scripting.JavaScript/V8/lib/DotNet.stuff
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if DOTNET && HOST_WINDOWS {
/* 0.00MB */ DotNet: "https://files.fusetools.com/tooling/t3gBQQmBwoYG-V8-DotNet.zip"
/* 0.00MB */ DotNet: "https://www.nuget.org/api/v2/package/V8.Simple-dotnet/5.5.0"
}
2 changes: 1 addition & 1 deletion Source/Fuse.Scripting.JavaScript/V8/lib/OSX.stuff
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if HOST_MAC {
/* 7.81MB */ OSX: "https://files.fusetools.com/tooling/IKVrJ1cgLssH-V8-macOS.zip"
/* 7.81MB */ OSX: "https://www.nuget.org/api/v2/package/V8.Simple-macOS/5.5.0"
}
2 changes: 1 addition & 1 deletion Source/Fuse.Scripting.JavaScript/V8/lib/Windows.stuff
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if HOST_WINDOWS {
/* 8.34MB */ Windows: "https://files.fusetools.com/tooling/v6vFc4M0R2IW-V8-Windows.zip"
/* 8.34MB */ Windows: "https://www.nuget.org/api/v2/package/V8.Simple-win32-x64/5.5.0"
}
21 changes: 7 additions & 14 deletions Source/Fuse.Text/Implementation/ICU.cil.uxl
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
<Extensions Backend="CIL">
<Define USE_ICU />
<Require Condition="HOST_WIN32 && HOST_X86" UnmanagedLibrary="../icu/x86/icu/bin/icudt55.dll" />
<Require Condition="HOST_WIN32 && HOST_X86" UnmanagedLibrary="../icu/x86/icu/bin/icuin55.dll" />
<Require Condition="HOST_WIN32 && HOST_X86" UnmanagedLibrary="../icu/x86/icu/bin/icuio55.dll" />
<Require Condition="HOST_WIN32 && HOST_X86" UnmanagedLibrary="../icu/x86/icu/bin/icule55.dll" />
<Require Condition="HOST_WIN32 && HOST_X86" UnmanagedLibrary="../icu/x86/icu/bin/iculx55.dll" />
<Require Condition="HOST_WIN32 && HOST_X86" UnmanagedLibrary="../icu/x86/icu/bin/icutu55.dll" />
<Require Condition="HOST_WIN32 && HOST_X86" UnmanagedLibrary="../icu/x86/icu/bin/icuuc55.dll" />
<Require Condition="HOST_WIN32 && HOST_X64" UnmanagedLibrary="../icu/x64/icu/bin64/icudt55.dll" />
<Require Condition="HOST_WIN32 && HOST_X64" UnmanagedLibrary="../icu/x64/icu/bin64/icuin55.dll" />
<Require Condition="HOST_WIN32 && HOST_X64" UnmanagedLibrary="../icu/x64/icu/bin64/icuio55.dll" />
<Require Condition="HOST_WIN32 && HOST_X64" UnmanagedLibrary="../icu/x64/icu/bin64/icule55.dll" />
<Require Condition="HOST_WIN32 && HOST_X64" UnmanagedLibrary="../icu/x64/icu/bin64/iculx55.dll" />
<Require Condition="HOST_WIN32 && HOST_X64" UnmanagedLibrary="../icu/x64/icu/bin64/icutu55.dll" />
<Require Condition="HOST_WIN32 && HOST_X64" UnmanagedLibrary="../icu/x64/icu/bin64/icuuc55.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary="../icu/x64/bin64/icudt55.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary="../icu/x64/bin64/icuin55.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary="../icu/x64/bin64/icuio55.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary="../icu/x64/bin64/icule55.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary="../icu/x64/bin64/iculx55.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary="../icu/x64/bin64/icutu55.dll" />
<Require Condition="HOST_WIN32" UnmanagedLibrary="../icu/x64/bin64/icuuc55.dll" />
</Extensions>
2 changes: 1 addition & 1 deletion Source/Fuse.Text/harfbuzz/lib/Android.stuff
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if ANDROID {
/* 0.21MB */ Android: "https://files.fusetools.com/tooling/pNKuE33KolYV-Harfbuzz-Android.zip"
/* 0.21MB */ Android: "https://www.nuget.org/api/v2/package/harfbuzz-android-static-armv7/1.2.4"
}
2 changes: 1 addition & 1 deletion Source/Fuse.Text/harfbuzz/lib/OSX.stuff
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if HOST_MAC {
/* 1.59MB */ OSX: "https://files.fusetools.com/tooling/xMmtmmgI4aXy-Harfbuzz-macOS.zip"
/* 1.59MB */ OSX: "https://www.nuget.org/api/v2/package/fuselibs-harfbuzz-macOS-static/1.2.4"
}
2 changes: 1 addition & 1 deletion Source/Fuse.Text/harfbuzz/lib/iOS.stuff
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if iOS {
/* 0.85MB */ iOS: "https://files.fusetools.com/tooling/1e8qkHS7YB9y-Harfbuzz-iOS.zip"
/* 0.85MB */ iOS: "https://www.nuget.org/api/v2/package/harfbuzz-iOS-static/1.2.4"
}
3 changes: 1 addition & 2 deletions Source/Fuse.Text/icu/Windows.stuff
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
if HOST_WINDOWS {
x86: "https://files.fusetools.com/tooling/HtthIgwJ2TdH-icu4c-55_1-Win32-msvc10.zip"
x64: "https://files.fusetools.com/tooling/Oe1jy7Kg5uTN-icu4c-55_1-Win64-msvc10.zip"
x64: "https://www.nuget.org/api/v2/package/icu-win32-shared-x64/55.1.0"
}
2 changes: 1 addition & 1 deletion Source/Fuse.Text/icu/iOS.stuff
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if iOS {
/* 12.79MB */ iOS: "https://files.fusetools.com/tooling/cphnpuXYu52e-ICU-iOS.zip"
/* 12.79MB */ iOS: "https://www.nuget.org/api/v2/package/icu-iOS-static/55.1.0"
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if iOS {
lib: "https://files.fusetools.com/tooling/W4ITHfzp9cvy-SocketRocket.zip"
lib: "https://www.nuget.org/api/v2/package/SocketRocket-iOS-static/0.4.2"
}
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.11.0",
"description": "Fuselibs is a collection of Uno libraries that provide the UI framework used to build Fuse apps.",
"devDependencies": {
"@fuse-open/uno": "1.11.0"
"@fuse-open/uno": "1.11.1"
},
"scripts": {
"build": "uno doctor Source",
Expand Down

0 comments on commit aee40d2

Please sign in to comment.