From 5c5a71708eaa4b01c260f9ccc0bcfadb6462ddbb Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 14:33:22 +0200 Subject: [PATCH 01/10] Adding a groovy script --- build.groovy | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++ build.ps1 | 2 +- 2 files changed, 221 insertions(+), 1 deletion(-) create mode 100644 build.groovy diff --git a/build.groovy b/build.groovy new file mode 100644 index 00000000..58f5165e --- /dev/null +++ b/build.groovy @@ -0,0 +1,220 @@ +import groovy.transform.Field + +@Field def isPr = false +@Field def branchName = null +@Field def commitHash = null +@Field def githubStatusSha = null + +@Field def stashes = [] +@Field def customEnv = [] + +properties([ + compressBuildLog() +]) + +// ============================================================================ +// Stages + +node("ubuntu-1604-amd64") { + stage("Prepare") { + timestamps { + checkout scm + commitHash = cmdResult("git rev-parse HEAD").trim() + + isPr = env.ghprbPullId && !env.ghprbPullId.empty + branchName = isPr ? "pr" : env.BRANCH_NAME + githubStatusSha = isPr ? env.ghprbActualCommit : commitHash + + echo "Building SHA1: ${commitHash}..." + echo " - PR: ${isPr}" + echo " - Branch Name: ${branchName}" + echo " - GitHub Status SHA1: ${githubStatusSha}" + + customEnv.push("GIT_SHA=${commitHash}") + } + } + + stage("Build") { + parallel([ + failFast: true, + + windows: createBuilder("Windows", "components-windows"), + macos: createBuilder("macOS", "components"), + linux: createBuilder("Linux", "ubuntu-1604-amd64"), + ]) + } + + stage("Package") { + parallel([ + failFast: true, + + package: createPackager(), + ]) + } + + stage("Clean Up") { + timestamps { + cleanWs() + } + } +} + +// ============================================================================ +// Functions + +def createBuilder(host, label) { + def githubContext = "Build - ${host}" + host = host.toLowerCase() + + reportGitHubStatus(githubContext, "PENDING", "Building...") + + return { + stage(githubContext) { + node(label) { + timestamps { + withEnv(customEnv[host] + ["NODE_LABEL=${label}"]) { + ws("${getWSRoot()}/build-${host}") { + try { + checkout scm + + cmd("pwsh build.ps1") + + step([ + $class: "XUnitPublisher", + testTimeMargin: "3000", + thresholdMode: 1, + thresholds: [[ + $class: "FailedThreshold", + failureNewThreshold: "0", + failureThreshold: "0", + unstableNewThreshold: "0", + unstableThreshold: "0" + ]], + tools: [[ + $class: "XUnitDotNetTestType", + deleteOutputFiles: true, + failIfNotNew: true, + pattern: "output/**/TestResult.xml", + skipNoTestFiles: false, + stopProcessingIfError: true + ]] + ]) + + stashes.push(host) + stash(name: host, includes: "output/**/*", allowEmpty: false) + + cleanWs() + reportGitHubStatus(githubContext, "SUCCESS", "Build complete.") + } catch (Exception e) { + reportGitHubStatus(githubContext, "FAILURE", "Build failed.") + throw e + } + } + } + } + } + } + } +} + +def createPackager() { + def githubContext = "Packing" + def host = "linux" + def label = "ubuntu-1604-amd64" + + reportGitHubStatus(githubContext, "PENDING", "Packing...") + + return { + stage(githubContext) { + node(label) { + timestamps{ + withEnv(customEnv[host] + ["NODE_LABEL=${label}"]) { + ws("${getWSRoot()}/pack-${host}") { + try { + checkout scm + stashes.each { unstash(it) } + + uploadBlobs() + + cleanWs() + reportGitHubStatus(githubContext, "SUCCESS", "Pack complete.") + } catch (Exception e) { + reportGitHubStatus(githubContext, "FAILURE", "Pack failed.") + throw e + } + } + } + } + } + } + } +} + +def uploadBlobs() { + fingerprint("output/**/*") + step([ + $class: "WAStoragePublisher", + allowAnonymousAccess: true, + cleanUpContainer: false, + cntPubAccess: true, + containerName: "skiasharp-public-artifacts", + doNotFailIfArchivingReturnsNothing: false, + doNotUploadIndividualFiles: false, + doNotWaitForPreviousBuild: true, + excludeFilesPath: "", + filesPath: "output/**/*", + storageAccName: "credential for xamjenkinsartifact", + storageCredentialId: "fbd29020e8166fbede5518e038544343", + uploadArtifactsOnlyIfSuccessful: false, + uploadZips: false, + virtualPath: "ArtifactsFor-${env.BUILD_NUMBER}/${commitHash}/", + ]) +} + +def reportGitHubStatus(context, statusResult, statusResultMessage) { + step([ + $class: "GitHubCommitStatusSetter", + commitShaSource: [ + $class: "ManuallyEnteredShaSource", + sha: githubStatusSha + ], + contextSource: [ + $class: "ManuallyEnteredCommitContextSource", + context: context + (isPr ? " (PR)" : "") + ], + statusBackrefSource: [ + $class: "ManuallyEnteredBackrefSource", + backref: env.BUILD_URL + ], + statusResultSource: [ + $class: "ConditionalStatusResultSource", + results: [[ + $class: "AnyBuildResult", + state: statusResult, + message: statusResultMessage + ]] + ] + ]) +} + +def cmd(script) { + if (isUnix()) { + return sh(script) + } else { + return powershell(script) + } +} + +def cmdResult(script) { + if (isUnix()) { + return sh(script: script, returnStdout: true) + } else { + return powershell(script: script, returnStdout: true) + } +} + +def getWSRoot() { + def cleanBranch = branchName.replace("/", "_").replace("\\", "_") + def wsRoot = isUnix() ? "workspace" : "C:/bld" + return "${wsRoot}/SkiaSharp/${cleanBranch}" +} diff --git a/build.ps1 b/build.ps1 index f896d4be..b3ee207a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop" if (!$env:BUILD_NUMBER) { $betaPrefix = "beta" } else { - $betaPrefix = "beta-$env:BUILD_NUMBER" + $betaPrefix = "beta$env:BUILD_NUMBER" } if ($IsMacOS) { From 98eb7bfdbe211e5c5d839fcc9f646a763cbe8a2a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 14:35:31 +0200 Subject: [PATCH 02/10] Removing linux as we don't yet support that --- build.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/build.groovy b/build.groovy index 58f5165e..3357f62e 100644 --- a/build.groovy +++ b/build.groovy @@ -40,7 +40,6 @@ node("ubuntu-1604-amd64") { windows: createBuilder("Windows", "components-windows"), macos: createBuilder("macOS", "components"), - linux: createBuilder("Linux", "ubuntu-1604-amd64"), ]) } From fb3160b202456aeb2532e9498d05d4ad20a5c60a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 14:39:15 +0200 Subject: [PATCH 03/10] Fixes to the script --- build.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.groovy b/build.groovy index 3357f62e..b3aad302 100644 --- a/build.groovy +++ b/build.groovy @@ -71,7 +71,7 @@ def createBuilder(host, label) { stage(githubContext) { node(label) { timestamps { - withEnv(customEnv[host] + ["NODE_LABEL=${label}"]) { + withEnv(customEnv + ["NODE_LABEL=${label}"]) { ws("${getWSRoot()}/build-${host}") { try { checkout scm @@ -127,7 +127,7 @@ def createPackager() { stage(githubContext) { node(label) { timestamps{ - withEnv(customEnv[host] + ["NODE_LABEL=${label}"]) { + withEnv(customEnv + ["NODE_LABEL=${label}"]) { ws("${getWSRoot()}/pack-${host}") { try { checkout scm @@ -156,7 +156,7 @@ def uploadBlobs() { allowAnonymousAccess: true, cleanUpContainer: false, cntPubAccess: true, - containerName: "skiasharp-public-artifacts", + containerName: "skiasharp-extended-public-artifacts", doNotFailIfArchivingReturnsNothing: false, doNotUploadIndividualFiles: false, doNotWaitForPreviousBuild: true, @@ -215,5 +215,5 @@ def cmdResult(script) { def getWSRoot() { def cleanBranch = branchName.replace("/", "_").replace("\\", "_") def wsRoot = isUnix() ? "workspace" : "C:/bld" - return "${wsRoot}/SkiaSharp/${cleanBranch}" + return "${wsRoot}/SkiaExd/${cleanBranch}" } From edc12c9837c76c2f5da6238b5daa48ee2f1d9262 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 14:42:24 +0200 Subject: [PATCH 04/10] Use powershell on mac as well --- build.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.groovy b/build.groovy index b3aad302..62bb737a 100644 --- a/build.groovy +++ b/build.groovy @@ -76,7 +76,11 @@ def createBuilder(host, label) { try { checkout scm - cmd("pwsh build.ps1") + if (isUnix()) { + sh("pwsh build.ps1") + } else { + powershell("build.ps1") + } step([ $class: "XUnitPublisher", From 1dc9adb45fd4c9155cb056af4c539a6bb86d25ea Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 14:45:20 +0200 Subject: [PATCH 05/10] Trying something else --- build.groovy | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/build.groovy b/build.groovy index 62bb737a..ba954bc6 100644 --- a/build.groovy +++ b/build.groovy @@ -76,11 +76,7 @@ def createBuilder(host, label) { try { checkout scm - if (isUnix()) { - sh("pwsh build.ps1") - } else { - powershell("build.ps1") - } + pwsh("build.ps1") step([ $class: "XUnitPublisher", @@ -200,11 +196,19 @@ def reportGitHubStatus(context, statusResult, statusResultMessage) { ]) } +def pwsh(script) { + if (isUnix()) { + return sh("pwsh " + script) + } else { + return bat("powershell " script) + } +} + def cmd(script) { if (isUnix()) { return sh(script) } else { - return powershell(script) + return bat(script) } } @@ -212,7 +216,7 @@ def cmdResult(script) { if (isUnix()) { return sh(script: script, returnStdout: true) } else { - return powershell(script: script, returnStdout: true) + return bat(script: script, returnStdout: true) } } From bd66591e58ee333cc7bc0f89dfa759da1bbad18a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 14:46:02 +0200 Subject: [PATCH 06/10] Fix typo --- build.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.groovy b/build.groovy index ba954bc6..f82788e4 100644 --- a/build.groovy +++ b/build.groovy @@ -200,7 +200,7 @@ def pwsh(script) { if (isUnix()) { return sh("pwsh " + script) } else { - return bat("powershell " script) + return bat("powershell " + script) } } From a44e95280d639869c77da3efb6fb299e75592153 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 14:49:23 +0200 Subject: [PATCH 07/10] ? --- build.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.groovy b/build.groovy index f82788e4..24de711b 100644 --- a/build.groovy +++ b/build.groovy @@ -76,7 +76,7 @@ def createBuilder(host, label) { try { checkout scm - pwsh("build.ps1") + pwsh("./build.ps1") step([ $class: "XUnitPublisher", From 95da0e58be9395d8e657cca3c06a04fabd2bc136 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 15:11:39 +0200 Subject: [PATCH 08/10] Shortning paths --- .../SkiaSharp.Extended.Iconify.sln | 10 ++-- .../SkiaSharpDemo.Droid/MainActivity.cs | 0 .../Properties/AndroidManifest.xml | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/Resource.Designer.cs | 0 .../Resources/drawable-hdpi/icon.png | Bin .../Resources/drawable-xhdpi/icon.png | Bin .../Resources/drawable-xxhdpi/icon.png | Bin .../Resources/drawable/icon.png | Bin .../Resources/layout/Tabbar.axml | 0 .../Resources/layout/Toolbar.axml | 0 .../Resources/values/styles.xml | 0 .../SkiaSharpDemo.Droid.csproj | 0 .../SkiaSharpDemo.UWP/App.xaml | 0 .../SkiaSharpDemo.UWP/App.xaml.cs | 0 .../Assets/LockScreenLogo.scale-200.png | Bin .../Assets/SplashScreen.scale-200.png | Bin .../Assets/Square150x150Logo.scale-200.png | Bin .../Assets/Square44x44Logo.scale-200.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../SkiaSharpDemo.UWP/Assets/StoreLogo.png | Bin .../Assets/Wide310x150Logo.scale-200.png | Bin .../SkiaSharpDemo.UWP/MainPage.xaml | 0 .../SkiaSharpDemo.UWP/MainPage.xaml.cs | 0 .../SkiaSharpDemo.UWP/Package.appxmanifest | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Default.rd.xml | 0 .../SkiaSharpDemo.UWP.csproj | 4 +- .../SkiaSharpDemo.iOS/AppDelegate.cs | 0 .../SkiaSharpDemo.iOS/Entitlements.plist | 0 .../SkiaSharpDemo.iOS/Info.plist | 0 .../SkiaSharpDemo.iOS/Main.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/Default-568h@2x.png | Bin .../Resources/Default-Portrait.png | Bin .../Resources/Default-Portrait@2x.png | Bin .../SkiaSharpDemo.iOS/Resources/Default.png | Bin .../Resources/Default@2x.png | Bin .../Resources/Icon-60@2x.png | Bin .../Resources/Icon-60@3x.png | Bin .../SkiaSharpDemo.iOS/Resources/Icon-76.png | Bin .../Resources/Icon-76@2x.png | Bin .../Resources/Icon-Small-40.png | Bin .../Resources/Icon-Small-40@2x.png | Bin .../Resources/Icon-Small-40@3x.png | Bin .../Resources/Icon-Small.png | Bin .../Resources/Icon-Small@2x.png | Bin .../Resources/Icon-Small@3x.png | Bin .../Resources/LaunchScreen.storyboard | 0 .../SkiaSharpDemo.iOS.csproj | 0 .../SkiaSharpDemo.iOS/iTunesArtwork | Bin .../SkiaSharpDemo.iOS/iTunesArtwork@2x | Bin .../SkiaSharpDemo.macOS/AppDelegate.cs | 0 .../AppIcon.appiconset/AppIcon-128.png | Bin .../AppIcon.appiconset/AppIcon-128@2x.png | Bin .../AppIcon.appiconset/AppIcon-16.png | Bin .../AppIcon.appiconset/AppIcon-16@2x.png | Bin .../AppIcon.appiconset/AppIcon-256.png | Bin .../AppIcon.appiconset/AppIcon-256@2x.png | Bin .../AppIcon.appiconset/AppIcon-32.png | Bin .../AppIcon.appiconset/AppIcon-32@2x.png | Bin .../AppIcon.appiconset/AppIcon-512.png | Bin .../AppIcon.appiconset/AppIcon-512@2x.png | Bin .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../SkiaSharpDemo.macOS/Entitlements.plist | 0 .../SkiaSharpDemo.macOS/Info.plist | 0 .../SkiaSharpDemo.macOS/Main.cs | 0 .../SkiaSharpDemo.macOS.csproj | 0 .../{SkiaSharpDemo => }/App.xaml | 0 .../{SkiaSharpDemo => }/App.xaml.cs | 0 .../{SkiaSharpDemo => }/MainPage.xaml | 0 .../{SkiaSharpDemo => }/MainPage.xaml.cs | 0 .../SkiaSharpDemo/SkiaSharpDemo.csproj | 45 ++++++++++++++++++ .../SkiaSharpDemo/SkiaSharpDemo.csproj | 45 ------------------ .../SkiaSharp.Extended.Svg.sln | 10 ++-- .../SkiaSharpDemo.Droid/MainActivity.cs | 0 .../Properties/AndroidManifest.xml | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/Resource.Designer.cs | 0 .../Resources/drawable-hdpi/icon.png | Bin .../Resources/drawable-xhdpi/icon.png | Bin .../Resources/drawable-xxhdpi/icon.png | Bin .../Resources/drawable/icon.png | Bin .../Resources/layout/Tabbar.axml | 0 .../Resources/layout/Toolbar.axml | 0 .../Resources/values/styles.xml | 0 .../SkiaSharpDemo.Droid.csproj | 0 .../SkiaSharpDemo.UWP/App.xaml | 0 .../SkiaSharpDemo.UWP/App.xaml.cs | 0 .../Assets/LockScreenLogo.scale-200.png | Bin .../Assets/SplashScreen.scale-200.png | Bin .../Assets/Square150x150Logo.scale-200.png | Bin .../Assets/Square44x44Logo.scale-200.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../SkiaSharpDemo.UWP/Assets/StoreLogo.png | Bin .../Assets/Wide310x150Logo.scale-200.png | Bin .../SkiaSharpDemo.UWP/MainPage.xaml | 0 .../SkiaSharpDemo.UWP/MainPage.xaml.cs | 0 .../SkiaSharpDemo.UWP/Package.appxmanifest | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Default.rd.xml | 0 .../SkiaSharpDemo.UWP.csproj | 4 +- .../SkiaSharpDemo.iOS/AppDelegate.cs | 0 .../SkiaSharpDemo.iOS/Entitlements.plist | 0 .../SkiaSharpDemo.iOS/Info.plist | 0 .../SkiaSharpDemo.iOS/Main.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/Default-568h@2x.png | Bin .../Resources/Default-Portrait.png | Bin .../Resources/Default-Portrait@2x.png | Bin .../SkiaSharpDemo.iOS/Resources/Default.png | Bin .../Resources/Default@2x.png | Bin .../Resources/Icon-60@2x.png | Bin .../Resources/Icon-60@3x.png | Bin .../SkiaSharpDemo.iOS/Resources/Icon-76.png | Bin .../Resources/Icon-76@2x.png | Bin .../Resources/Icon-Small-40.png | Bin .../Resources/Icon-Small-40@2x.png | Bin .../Resources/Icon-Small-40@3x.png | Bin .../Resources/Icon-Small.png | Bin .../Resources/Icon-Small@2x.png | Bin .../Resources/Icon-Small@3x.png | Bin .../Resources/LaunchScreen.storyboard | 0 .../SkiaSharpDemo.iOS.csproj | 0 .../SkiaSharpDemo.iOS/iTunesArtwork | Bin .../SkiaSharpDemo.iOS/iTunesArtwork@2x | Bin .../SkiaSharpDemo.macOS/AppDelegate.cs | 0 .../AppIcon.appiconset/AppIcon-128.png | Bin .../AppIcon.appiconset/AppIcon-128@2x.png | Bin .../AppIcon.appiconset/AppIcon-16.png | Bin .../AppIcon.appiconset/AppIcon-16@2x.png | Bin .../AppIcon.appiconset/AppIcon-256.png | Bin .../AppIcon.appiconset/AppIcon-256@2x.png | Bin .../AppIcon.appiconset/AppIcon-32.png | Bin .../AppIcon.appiconset/AppIcon-32@2x.png | Bin .../AppIcon.appiconset/AppIcon-512.png | Bin .../AppIcon.appiconset/AppIcon-512@2x.png | Bin .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../SkiaSharpDemo.macOS/Entitlements.plist | 0 .../SkiaSharpDemo.macOS/Info.plist | 0 .../SkiaSharpDemo.macOS/Main.cs | 0 .../SkiaSharpDemo.macOS.csproj | 0 .../{SkiaSharpDemo => }/App.xaml | 0 .../{SkiaSharpDemo => }/App.xaml.cs | 0 .../{SkiaSharpDemo => }/MainPage.xaml | 0 .../{SkiaSharpDemo => }/MainPage.xaml.cs | 0 .../{SkiaSharpDemo => }/SkiaSharpDemo.csproj | 2 +- .../{SkiaSharpDemo => }/images/dashes.svg | 0 .../{SkiaSharpDemo => }/images/logos.svg | 0 .../{SkiaSharpDemo => }/images/opacity.svg | 0 SkiaSharp.Extended/SkiaSharp.Extended.sln | 10 ++-- .../SkiaSharpDemo.Droid/MainActivity.cs | 0 .../Properties/AndroidManifest.xml | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/Resource.Designer.cs | 0 .../Resources/drawable-hdpi/icon.png | Bin .../Resources/drawable-xhdpi/icon.png | Bin .../Resources/drawable-xxhdpi/icon.png | Bin .../Resources/drawable/icon.png | Bin .../Resources/layout/Tabbar.axml | 0 .../Resources/layout/Toolbar.axml | 0 .../Resources/values/styles.xml | 0 .../SkiaSharpDemo.Droid.csproj | 0 .../SkiaSharpDemo.UWP/App.xaml | 0 .../SkiaSharpDemo.UWP/App.xaml.cs | 0 .../Assets/LockScreenLogo.scale-200.png | Bin .../Assets/SplashScreen.scale-200.png | Bin .../Assets/Square150x150Logo.scale-200.png | Bin .../Assets/Square44x44Logo.scale-200.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../SkiaSharpDemo.UWP/Assets/StoreLogo.png | Bin .../Assets/Wide310x150Logo.scale-200.png | Bin .../SkiaSharpDemo.UWP/MainPage.xaml | 0 .../SkiaSharpDemo.UWP/MainPage.xaml.cs | 0 .../SkiaSharpDemo.UWP/Package.appxmanifest | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Default.rd.xml | 0 .../SkiaSharpDemo.UWP.csproj | 4 +- .../SkiaSharpDemo.iOS/AppDelegate.cs | 0 .../SkiaSharpDemo.iOS/Entitlements.plist | 0 .../SkiaSharpDemo.iOS/Info.plist | 0 .../SkiaSharpDemo.iOS/Main.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/Default-568h@2x.png | Bin .../Resources/Default-Portrait.png | Bin .../Resources/Default-Portrait@2x.png | Bin .../SkiaSharpDemo.iOS/Resources/Default.png | Bin .../Resources/Default@2x.png | Bin .../Resources/Icon-60@2x.png | Bin .../Resources/Icon-60@3x.png | Bin .../SkiaSharpDemo.iOS/Resources/Icon-76.png | Bin .../Resources/Icon-76@2x.png | Bin .../Resources/Icon-Small-40.png | Bin .../Resources/Icon-Small-40@2x.png | Bin .../Resources/Icon-Small-40@3x.png | Bin .../Resources/Icon-Small.png | Bin .../Resources/Icon-Small@2x.png | Bin .../Resources/Icon-Small@3x.png | Bin .../Resources/LaunchScreen.storyboard | 0 .../SkiaSharpDemo.iOS.csproj | 0 .../SkiaSharpDemo.iOS/iTunesArtwork | Bin .../SkiaSharpDemo.iOS/iTunesArtwork@2x | Bin .../SkiaSharpDemo.macOS/AppDelegate.cs | 0 .../AppIcon.appiconset/AppIcon-128.png | Bin .../AppIcon.appiconset/AppIcon-128@2x.png | Bin .../AppIcon.appiconset/AppIcon-16.png | Bin .../AppIcon.appiconset/AppIcon-16@2x.png | Bin .../AppIcon.appiconset/AppIcon-256.png | Bin .../AppIcon.appiconset/AppIcon-256@2x.png | Bin .../AppIcon.appiconset/AppIcon-32.png | Bin .../AppIcon.appiconset/AppIcon-32@2x.png | Bin .../AppIcon.appiconset/AppIcon-512.png | Bin .../AppIcon.appiconset/AppIcon-512@2x.png | Bin .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../SkiaSharpDemo.macOS/Entitlements.plist | 0 .../SkiaSharpDemo.macOS/Info.plist | 0 .../SkiaSharpDemo.macOS/Main.cs | 0 .../SkiaSharpDemo.macOS.csproj | 0 .../{SkiaSharpDemo => }/App.xaml | 0 .../{SkiaSharpDemo => }/App.xaml.cs | 0 .../{SkiaSharpDemo => }/MainPage.xaml | 0 .../{SkiaSharpDemo => }/MainPage.xaml.cs | 0 .../{SkiaSharpDemo => }/SkiaSharpDemo.csproj | 2 +- build.ps1 | 10 ++-- 227 files changed, 73 insertions(+), 73 deletions(-) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/MainActivity.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable/icon.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/values/styles.xml (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/App.xaml (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/App.xaml.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/StoreLogo.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/MainPage.xaml (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/MainPage.xaml.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Package.appxmanifest (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Properties/Default.rd.xml (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj (97%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/AppDelegate.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Entitlements.plist (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Info.plist (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Main.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-Portrait.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-76.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/iTunesArtwork (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/iTunesArtwork@2x (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/AppDelegate.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Entitlements.plist (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Info.plist (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Main.cs (100%) rename SkiaSharp.Extended.Iconify/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj (100%) rename SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/{SkiaSharpDemo => }/App.xaml (100%) rename SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/{SkiaSharpDemo => }/App.xaml.cs (100%) rename SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/{SkiaSharpDemo => }/MainPage.xaml (100%) rename SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/{SkiaSharpDemo => }/MainPage.xaml.cs (100%) create mode 100644 SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.csproj delete mode 100644 SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/MainActivity.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable/icon.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/values/styles.xml (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/App.xaml (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/App.xaml.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/StoreLogo.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/MainPage.xaml (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/MainPage.xaml.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Package.appxmanifest (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Properties/Default.rd.xml (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj (97%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/AppDelegate.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Entitlements.plist (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Info.plist (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Main.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-Portrait.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-76.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/iTunesArtwork (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/iTunesArtwork@2x (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/AppDelegate.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Entitlements.plist (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Info.plist (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Main.cs (100%) rename SkiaSharp.Extended.Svg/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj (100%) rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/{SkiaSharpDemo => }/App.xaml (100%) rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/{SkiaSharpDemo => }/App.xaml.cs (100%) rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/{SkiaSharpDemo => }/MainPage.xaml (100%) rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/{SkiaSharpDemo => }/MainPage.xaml.cs (100%) rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/{SkiaSharpDemo => }/SkiaSharpDemo.csproj (93%) rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/{SkiaSharpDemo => }/images/dashes.svg (100%) rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/{SkiaSharpDemo => }/images/logos.svg (100%) rename SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/{SkiaSharpDemo => }/images/opacity.svg (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/MainActivity.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/drawable/icon.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/Resources/values/styles.xml (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/App.xaml (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/App.xaml.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/StoreLogo.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/MainPage.xaml (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/MainPage.xaml.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Package.appxmanifest (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/Properties/Default.rd.xml (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj (97%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/AppDelegate.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Entitlements.plist (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Info.plist (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Main.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-Portrait.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Default@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-76.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/iTunesArtwork (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.iOS/iTunesArtwork@2x (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/AppDelegate.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Entitlements.plist (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Info.plist (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/Main.cs (100%) rename SkiaSharp.Extended/samples/{SkiaSharpDemo => }/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj (100%) rename SkiaSharp.Extended/samples/SkiaSharpDemo/{SkiaSharpDemo => }/App.xaml (100%) rename SkiaSharp.Extended/samples/SkiaSharpDemo/{SkiaSharpDemo => }/App.xaml.cs (100%) rename SkiaSharp.Extended/samples/SkiaSharpDemo/{SkiaSharpDemo => }/MainPage.xaml (100%) rename SkiaSharp.Extended/samples/SkiaSharpDemo/{SkiaSharpDemo => }/MainPage.xaml.cs (100%) rename SkiaSharp.Extended/samples/SkiaSharpDemo/{SkiaSharpDemo => }/SkiaSharpDemo.csproj (93%) diff --git a/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln b/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln index 40ac6ce3..a262df89 100644 --- a/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln +++ b/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln @@ -26,15 +26,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FA22 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{6F5C7A8D-8B31-40FE-A48B-7441810658AE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo.csproj", "{6F5C7A8D-8B31-40FE-A48B-7441810658AE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/MainActivity.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/MainActivity.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/MainActivity.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/MainActivity.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable/icon.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/drawable/icon.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable/icon.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/drawable/icon.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/values/styles.xml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/values/styles.xml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/values/styles.xml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/Resources/values/styles.xml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/App.xaml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/App.xaml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/App.xaml.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/App.xaml.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/StoreLogo.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/StoreLogo.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/StoreLogo.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/StoreLogo.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/MainPage.xaml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/MainPage.xaml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/MainPage.xaml.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/MainPage.xaml.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Package.appxmanifest similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Package.appxmanifest diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/Default.rd.xml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Properties/Default.rd.xml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/Default.rd.xml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/Properties/Default.rd.xml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj similarity index 97% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj index 56e100a5..f60bb237 100644 --- a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj +++ b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj @@ -17,7 +17,7 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\..\keys\UWP_App_Key.pfx + ..\..\..\keys\UWP_App_Key.pfx B78C3BAF61B65EE64B6B4EDB0B18039E968078B2 @@ -115,7 +115,7 @@ Designer - + diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/AppDelegate.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/AppDelegate.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/AppDelegate.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/AppDelegate.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Entitlements.plist b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Entitlements.plist similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Entitlements.plist rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Entitlements.plist diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Info.plist b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Info.plist similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Info.plist rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Info.plist diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Main.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Main.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Main.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Main.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Default@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-76.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-76.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/iTunesArtwork similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/iTunesArtwork diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork@2x b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/iTunesArtwork@2x similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork@2x rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.iOS/iTunesArtwork@2x diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/AppDelegate.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/AppDelegate.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/AppDelegate.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/AppDelegate.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Entitlements.plist b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Entitlements.plist similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Entitlements.plist rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Entitlements.plist diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Info.plist b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Info.plist similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Info.plist rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Info.plist diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Main.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Main.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Main.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/Main.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/App.xaml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/App.xaml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/App.xaml.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/App.xaml.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/MainPage.xaml similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/MainPage.xaml diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/MainPage.xaml.cs similarity index 100% rename from SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs rename to SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/MainPage.xaml.cs diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.csproj b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.csproj new file mode 100644 index 00000000..e9ed5e3e --- /dev/null +++ b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo.csproj @@ -0,0 +1,45 @@ + + + + + netstandard1.3 + + + + TRACE;DEBUG;NET_STANDARD + + + TRACE;NET_STANDARD + + + + + + + + + + + + + + + + + + + + + + + *.xaml + + + + + + MSBuild:UpdateDesignTimeXaml + + + + \ No newline at end of file diff --git a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj b/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj deleted file mode 100644 index c1edb00d..00000000 --- a/SkiaSharp.Extended.Iconify/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj +++ /dev/null @@ -1,45 +0,0 @@ - - - - - netstandard1.3 - - - - TRACE;DEBUG;NET_STANDARD - - - TRACE;NET_STANDARD - - - - - - - - - - - - - - - - - - - - - - - *.xaml - - - - - - MSBuild:UpdateDesignTimeXaml - - - - \ No newline at end of file diff --git a/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln b/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln index b4f35146..cdcafbc1 100644 --- a/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln +++ b/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln @@ -6,17 +6,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg.Test EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{51B0C2C7-732B-4A5C-A4F2-55655D147866}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{D3D0D6EA-99FE-4C5B-AD21-31E6332F0199}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg", "source\SkiaSharp.Extended.Svg.csproj", "{5F472166-361D-4D45-84C9-72B8566D03A2}" EndProject diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/MainActivity.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/MainActivity.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/MainActivity.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/MainActivity.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable/icon.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/drawable/icon.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable/icon.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/drawable/icon.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/values/styles.xml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/values/styles.xml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/values/styles.xml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/Resources/values/styles.xml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/App.xaml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/App.xaml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/App.xaml.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/App.xaml.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/StoreLogo.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/StoreLogo.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/StoreLogo.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/StoreLogo.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/MainPage.xaml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/MainPage.xaml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/MainPage.xaml.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/MainPage.xaml.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Package.appxmanifest similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Package.appxmanifest diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/Default.rd.xml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Properties/Default.rd.xml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/Default.rd.xml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/Properties/Default.rd.xml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj similarity index 97% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj index b7ee5670..31f5f66c 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj +++ b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj @@ -17,7 +17,7 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\..\keys\UWP_App_Key.pfx + ..\..\..\keys\UWP_App_Key.pfx B78C3BAF61B65EE64B6B4EDB0B18039E968078B2 @@ -118,7 +118,7 @@ Designer - + diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/AppDelegate.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/AppDelegate.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/AppDelegate.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/AppDelegate.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Entitlements.plist b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Entitlements.plist similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Entitlements.plist rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Entitlements.plist diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Info.plist b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Info.plist similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Info.plist rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Info.plist diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Main.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Main.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Main.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Main.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Default@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-76.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-76.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/iTunesArtwork similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/iTunesArtwork diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork@2x b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/iTunesArtwork@2x similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork@2x rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.iOS/iTunesArtwork@2x diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/AppDelegate.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/AppDelegate.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/AppDelegate.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/AppDelegate.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Entitlements.plist b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Entitlements.plist similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Entitlements.plist rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Entitlements.plist diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Info.plist b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Info.plist similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Info.plist rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Info.plist diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Main.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Main.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Main.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/Main.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/App.xaml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/App.xaml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/App.xaml.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/App.xaml.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/MainPage.xaml similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/MainPage.xaml diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/MainPage.xaml.cs similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/MainPage.xaml.cs diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.csproj similarity index 93% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.csproj index 62191741..07657d72 100644 --- a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj +++ b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo.csproj @@ -19,7 +19,7 @@ - + diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/images/dashes.svg b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/images/dashes.svg similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/images/dashes.svg rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/images/dashes.svg diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/images/logos.svg b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/images/logos.svg similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/images/logos.svg rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/images/logos.svg diff --git a/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/images/opacity.svg b/SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/images/opacity.svg similarity index 100% rename from SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/SkiaSharpDemo/images/opacity.svg rename to SkiaSharp.Extended.Svg/samples/SkiaSharpDemo/images/opacity.svg diff --git a/SkiaSharp.Extended/SkiaSharp.Extended.sln b/SkiaSharp.Extended/SkiaSharp.Extended.sln index 04c32520..aa73ffc6 100644 --- a/SkiaSharp.Extended/SkiaSharp.Extended.sln +++ b/SkiaSharp.Extended/SkiaSharp.Extended.sln @@ -9,17 +9,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended", "sourc EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{51B0C2C7-732B-4A5C-A4F2-55655D147866}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{D3D0D6EA-99FE-4C5B-AD21-31E6332F0199}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/MainActivity.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/MainActivity.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/MainActivity.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/MainActivity.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Properties/AndroidManifest.xml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/Resource.Designer.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/drawable-hdpi/icon.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/drawable-xhdpi/icon.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/drawable-xxhdpi/icon.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable/icon.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/drawable/icon.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/drawable/icon.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/drawable/icon.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/layout/Tabbar.axml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/layout/Toolbar.axml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/values/styles.xml b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/values/styles.xml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/Resources/values/styles.xml rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/Resources/values/styles.xml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj b/SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj rename to SkiaSharp.Extended/samples/SkiaSharpDemo.Droid/SkiaSharpDemo.Droid.csproj diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/App.xaml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/App.xaml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/App.xaml.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/App.xaml.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/App.xaml.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/LockScreenLogo.scale-200.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/SplashScreen.scale-200.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/Square150x150Logo.scale-200.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.scale-200.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/StoreLogo.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/StoreLogo.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/StoreLogo.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/StoreLogo.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Assets/Wide310x150Logo.scale-200.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/MainPage.xaml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/MainPage.xaml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/MainPage.xaml.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/MainPage.xaml.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/MainPage.xaml.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Package.appxmanifest similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Package.appxmanifest rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Package.appxmanifest diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/Default.rd.xml b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Properties/Default.rd.xml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/Properties/Default.rd.xml rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/Properties/Default.rd.xml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj similarity index 97% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj rename to SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj index 56e100a5..f60bb237 100644 --- a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj +++ b/SkiaSharp.Extended/samples/SkiaSharpDemo.UWP/SkiaSharpDemo.UWP.csproj @@ -17,7 +17,7 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\..\keys\UWP_App_Key.pfx + ..\..\..\keys\UWP_App_Key.pfx B78C3BAF61B65EE64B6B4EDB0B18039E968078B2 @@ -115,7 +115,7 @@ Designer - + diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/AppDelegate.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/AppDelegate.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/AppDelegate.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/AppDelegate.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Entitlements.plist b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Entitlements.plist similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Entitlements.plist rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Entitlements.plist diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Info.plist b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Info.plist similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Info.plist rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Info.plist diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Main.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Main.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Main.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Main.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Properties/AssemblyInfo.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default-568h@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default-Portrait@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Default@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Default@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-60@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-60@3x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-76.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-76.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-76@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small-40@3x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/Icon-Small@3x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/Resources/LaunchScreen.storyboard diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/SkiaSharpDemo.iOS.csproj diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/iTunesArtwork similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/iTunesArtwork diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork@2x b/SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/iTunesArtwork@2x similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.iOS/iTunesArtwork@2x rename to SkiaSharp.Extended/samples/SkiaSharpDemo.iOS/iTunesArtwork@2x diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/AppDelegate.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/AppDelegate.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/AppDelegate.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/AppDelegate.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Assets.xcassets/Contents.json diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Entitlements.plist b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Entitlements.plist similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Entitlements.plist rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Entitlements.plist diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Info.plist b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Info.plist similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Info.plist rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Info.plist diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Main.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Main.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/Main.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/Main.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj b/SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj rename to SkiaSharp.Extended/samples/SkiaSharpDemo.macOS/SkiaSharpDemo.macOS.csproj diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml b/SkiaSharp.Extended/samples/SkiaSharpDemo/App.xaml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml rename to SkiaSharp.Extended/samples/SkiaSharpDemo/App.xaml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo/App.xaml.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/App.xaml.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo/App.xaml.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml b/SkiaSharp.Extended/samples/SkiaSharpDemo/MainPage.xaml similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml rename to SkiaSharp.Extended/samples/SkiaSharpDemo/MainPage.xaml diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs b/SkiaSharp.Extended/samples/SkiaSharpDemo/MainPage.xaml.cs similarity index 100% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/MainPage.xaml.cs rename to SkiaSharp.Extended/samples/SkiaSharpDemo/MainPage.xaml.cs diff --git a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj b/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.csproj similarity index 93% rename from SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj rename to SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.csproj index 2360a8b1..eda7c7f0 100644 --- a/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo/SkiaSharpDemo.csproj +++ b/SkiaSharp.Extended/samples/SkiaSharpDemo/SkiaSharpDemo.csproj @@ -19,7 +19,7 @@ - + diff --git a/build.ps1 b/build.ps1 index b3ee207a..ddfdd69a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -22,10 +22,10 @@ function Build $extraProperties = "/p:Platform=iPhoneSimulator" } - & $msbuild $solution /m /t:restore /p:Configuration=Release $extraProperties + & $msbuild $solution /m /v:m /t:restore /p:Configuration=Release $extraProperties if ($lastexitcode -ne 0) { exit $lastexitcode } - & $msbuild $solution /m /t:build /p:Configuration=Release $extraProperties + & $msbuild $solution /m /v:m /t:build /p:Configuration=Release $extraProperties if ($lastexitcode -ne 0) { exit $lastexitcode } } @@ -33,10 +33,10 @@ function Pack { Param ([string] $project, [string] $output) - & $msbuild $project /m /t:pack /p:Configuration=Release + & $msbuild $project /m /v:m /t:pack /p:Configuration=Release if ($lastexitcode -ne 0) { exit $lastexitcode } - & $msbuild $project /m /t:pack /p:Configuration=Release /p:VersionSuffix="$betaPrefix" + & $msbuild $project /m /v:m /t:pack /p:Configuration=Release /p:VersionSuffix="$betaPrefix" if ($lastexitcode -ne 0) { exit $lastexitcode } $dir = [System.IO.Path]::GetDirectoryName($project) @@ -48,7 +48,7 @@ function Test { Param ([string] $project, [string] $output) - & $msbuild $project /m /t:test /p:Configuration=Release + & $msbuild $project /m /v:m /t:test /p:Configuration=Release if ($lastexitcode -ne 0) { exit $lastexitcode } $dir = [System.IO.Path]::GetDirectoryName($project) From fdfe82cd0517ec2f243c5bbaae2a9a0593b10088 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 15:18:46 +0200 Subject: [PATCH 09/10] no parallel --- build.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.ps1 b/build.ps1 index ddfdd69a..a58a12b2 100644 --- a/build.ps1 +++ b/build.ps1 @@ -22,10 +22,10 @@ function Build $extraProperties = "/p:Platform=iPhoneSimulator" } - & $msbuild $solution /m /v:m /t:restore /p:Configuration=Release $extraProperties + & $msbuild $solution /v:m /t:restore /p:Configuration=Release $extraProperties if ($lastexitcode -ne 0) { exit $lastexitcode } - & $msbuild $solution /m /v:m /t:build /p:Configuration=Release $extraProperties + & $msbuild $solution /v:m /t:build /p:Configuration=Release $extraProperties if ($lastexitcode -ne 0) { exit $lastexitcode } } @@ -33,10 +33,10 @@ function Pack { Param ([string] $project, [string] $output) - & $msbuild $project /m /v:m /t:pack /p:Configuration=Release + & $msbuild $project /v:m /t:pack /p:Configuration=Release if ($lastexitcode -ne 0) { exit $lastexitcode } - & $msbuild $project /m /v:m /t:pack /p:Configuration=Release /p:VersionSuffix="$betaPrefix" + & $msbuild $project /v:m /t:pack /p:Configuration=Release /p:VersionSuffix="$betaPrefix" if ($lastexitcode -ne 0) { exit $lastexitcode } $dir = [System.IO.Path]::GetDirectoryName($project) @@ -48,7 +48,7 @@ function Test { Param ([string] $project, [string] $output) - & $msbuild $project /m /v:m /t:test /p:Configuration=Release + & $msbuild $project /v:m /t:test /p:Configuration=Release if ($lastexitcode -ne 0) { exit $lastexitcode } $dir = [System.IO.Path]::GetDirectoryName($project) From d6ae0b062e43b1bb0cf0c2daf1b067cf48883743 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 19 Oct 2018 15:40:46 +0200 Subject: [PATCH 10/10] Use xUnit results --- .../tests/SkiaSharp.Extended.Svg.Tests.csproj | 2 +- SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj index 638e4be2..5f392217 100644 --- a/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj +++ b/SkiaSharp.Extended.Svg/tests/SkiaSharp.Extended.Svg.Tests.csproj @@ -27,7 +27,7 @@ - + \ No newline at end of file diff --git a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj index cf6c7feb..f0f451ba 100644 --- a/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj +++ b/SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj @@ -22,7 +22,7 @@ - + \ No newline at end of file