From 2646a667cd826ee0bd395196ec8f6b60d6c76c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jerome.laban@nventive.com>
Date: Fri, 17 May 2019 11:25:39 -0400
Subject: [PATCH 1/6] Move overflow textblock to ItemsControl

---
 src/Calculator.Shared/Views/Calculator.xaml | 22 +++++++++------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/Calculator.Shared/Views/Calculator.xaml b/src/Calculator.Shared/Views/Calculator.xaml
index 287c0b6b..0cff7541 100644
--- a/src/Calculator.Shared/Views/Calculator.xaml
+++ b/src/Calculator.Shared/Views/Calculator.xaml
@@ -168,7 +168,7 @@
 			</Setter>
 		</Style>
 
-    <!-- UNO TODO -->
+	  <!-- UNO TODO -->
         <Style x:Key="overflowTextBlockStyle" TargetType="controls:OverflowTextBlock">
 
 			<Setter Property="HorizontalAlignment"
@@ -193,30 +193,26 @@
 															VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 															Style="{StaticResource ResultsScrollerSnapped}"
 															AutomationProperties.AccessibilityView="Raw">
-									<ListView x:Name="TokenList"
+									<!-- UNO TODO-->
+									<ItemsControl x:Name="TokenList"
 														Padding="0"
 														VerticalAlignment="Stretch"
 														HorizontalContentAlignment="Right"
 														VerticalContentAlignment="Stretch"
 														IsTabStop="False"
 														ItemTemplateSelector="{StaticResource ExpressionItemTemplateSelector}"
-														ItemsSource="{Binding ExpressionTokens}"
-														ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-														ScrollViewer.HorizontalScrollMode="Enabled"
-														ScrollViewer.VerticalScrollBarVisibility="Disabled"
-														ScrollViewer.VerticalScrollMode="Disabled"
-														SelectionMode="None">
-										<ListView.ItemsPanel>
+														ItemsSource="{Binding ExpressionTokens}">
+									  <ItemsControl.ItemsPanel>
 											<ItemsPanelTemplate>
 												<StackPanel HorizontalAlignment="Right"
 																		VerticalAlignment="Stretch"
 																		Orientation="Horizontal" />
 											</ItemsPanelTemplate>
-										</ListView.ItemsPanel>
-										<ListView.ItemContainerTransitions>
+										</ItemsControl.ItemsPanel>
+									    <ItemsControl.ItemContainerTransitions>
 											<TransitionCollection />
-										</ListView.ItemContainerTransitions>
-									</ListView>
+										</ItemsControl.ItemContainerTransitions>
+									</ItemsControl>
 								</ScrollViewer>
 								<Button x:Name="scrollLeft"
 												x:Uid="scrollLeft"

From 2bbc2a8fe0960aab14722257189cfc6f37d75278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jerome.laban@nventive.com>
Date: Fri, 17 May 2019 11:38:14 -0400
Subject: [PATCH 2/6] Enable linux build

---
 .vsts-ci.Linux.yml   | 59 ++++++++++++++++++++++++++++++++++++++++++++
 .vsts-ci.Windows.yml | 35 ++++++++++++++++++++++++++
 .vsts-ci.yml         | 41 ++++++------------------------
 3 files changed, 101 insertions(+), 34 deletions(-)
 create mode 100644 .vsts-ci.Linux.yml
 create mode 100644 .vsts-ci.Windows.yml

diff --git a/.vsts-ci.Linux.yml b/.vsts-ci.Linux.yml
new file mode 100644
index 00000000..18e49964
--- /dev/null
+++ b/.vsts-ci.Linux.yml
@@ -0,0 +1,59 @@
+jobs:
+- job: linux
+  container: nv-bionic-wasm
+
+  pool:
+    vmImage: 'ubuntu-16.04'
+
+  variables:
+    NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
+
+  steps:
+  - checkout: self
+    clean: true
+  
+  - bash: |
+      sudo chmod -R 777 /emsdk
+      cd /emsdk
+      sudo ./emsdk activate sdk-1.38.28-64bit
+
+    displayName: 'Setup Emscripten'
+
+  - task: GitVersion@4
+    inputs:
+      updateAssemblyInfo: false
+
+  - script: |
+      source /emsdk/emsdk_env.sh
+      cd src/CalcManager
+      ./build.sh
+
+    displayName: 'Build Wasm CalcManager'
+
+    env:
+      GITVERSION_FullSemVer: $(GITVERSION_FullSemVer)
+
+  - script: |
+      source /emsdk/emsdk_env.sh
+      cd $(build.sourcesdirectory)
+      msbuild /r /p:Configuration=Release "/p:PackageVersion=$(GITVERSION_FullSemVer)" /p:MixedModeBuild=$(MixedModeBuild) $(build.sourcesdirectory)/src/Calculator.Wasm/Calculator.Wasm.csproj
+
+    env:
+      GITVERSION_FullSemVer: $(GITVERSION_FullSemVer)
+    displayName: 'Build Calculator'
+
+  - task: CopyFiles@2
+    displayName: 'Publish Wasm Binaries'
+    inputs:
+      SourceFolder: $(build.sourcesdirectory)/src/Calculator.Wasm/bin/Release/netstandard2.0/dist
+      Contents: '**/*.*'
+      TargetFolder: $(build.artifactstagingdirectory)/Uno-Calculator-wasm
+      CleanTargetFolder: false
+      OverWrite: false
+      flattenFolders: false
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: $(build.artifactstagingdirectory)
+      ArtifactName: Uno-Calculator-wasm
+      ArtifactType: Container
diff --git a/.vsts-ci.Windows.yml b/.vsts-ci.Windows.yml
new file mode 100644
index 00000000..c4246f36
--- /dev/null
+++ b/.vsts-ci.Windows.yml
@@ -0,0 +1,35 @@
+jobs:
+- job: Windows
+
+  pool:
+    vmImage: 'windows-2019'
+
+  steps:
+  - task: GitVersion@4
+    inputs:
+      updateAssemblyInfo: false   
+      
+  - task: NuGetToolInstaller@0
+    inputs:
+        versionSpec: 4.9.1
+        checkLatest: false
+
+  - task: MSBuild@1
+    inputs:
+      solution: src/Calculator.sln
+      msbuildLocationMethod: version
+      msbuildVersion: latest
+      msbuildArchitecture: x86
+      msbuildArguments: /r /p:Configuration=Release "/p:PackageVersion=%GITVERSION_FullSemVer%" "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /detailedsummary
+      clean: false
+      maximumCpuCount: true
+      restoreNugetPackages: false
+      logProjectEvents: false
+      createLogFile: false
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Package Artifacts
+    inputs:
+      pathToPublish: $(build.artifactstagingdirectory)
+      artifactType: container
+      artifactName: UnoBanner
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index c4246f36..8a41e23e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -1,35 +1,8 @@
+resources:
+  containers:
+  - container: nv-bionic-wasm
+    image: nventive/wasm-build:1.2
+
 jobs:
-- job: Windows
-
-  pool:
-    vmImage: 'windows-2019'
-
-  steps:
-  - task: GitVersion@4
-    inputs:
-      updateAssemblyInfo: false   
-      
-  - task: NuGetToolInstaller@0
-    inputs:
-        versionSpec: 4.9.1
-        checkLatest: false
-
-  - task: MSBuild@1
-    inputs:
-      solution: src/Calculator.sln
-      msbuildLocationMethod: version
-      msbuildVersion: latest
-      msbuildArchitecture: x86
-      msbuildArguments: /r /p:Configuration=Release "/p:PackageVersion=%GITVERSION_FullSemVer%" "/p:InformationalVersion=%GITVERSION_InformationalVersion%" /detailedsummary
-      clean: false
-      maximumCpuCount: true
-      restoreNugetPackages: false
-      logProjectEvents: false
-      createLogFile: false
-
-  - task: PublishBuildArtifacts@1
-    displayName: Publish Package Artifacts
-    inputs:
-      pathToPublish: $(build.artifactstagingdirectory)
-      artifactType: container
-      artifactName: UnoBanner
+- template: .vsts-ci.Windows.yml
+- template: .vsts-ci.Linux.yml

From 52ff6460a716f82f6b2487fd317fce9e7d6da887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jerome.laban@nventive.com>
Date: Fri, 17 May 2019 13:05:57 -0400
Subject: [PATCH 3/6] Make build.sh executable

---
 .vsts-ci.Linux.yml       | 1 +
 src/CalcManager/build.sh | 0
 2 files changed, 1 insertion(+)
 mode change 100644 => 100755 src/CalcManager/build.sh

diff --git a/.vsts-ci.Linux.yml b/.vsts-ci.Linux.yml
index 18e49964..2563255e 100644
--- a/.vsts-ci.Linux.yml
+++ b/.vsts-ci.Linux.yml
@@ -26,6 +26,7 @@ jobs:
   - script: |
       source /emsdk/emsdk_env.sh
       cd src/CalcManager
+      chmod +x build.sh
       ./build.sh
 
     displayName: 'Build Wasm CalcManager'
diff --git a/src/CalcManager/build.sh b/src/CalcManager/build.sh
old mode 100644
new mode 100755

From ee8a79701dc205ad85134b5c0b3773ee7f77dab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jerome.laban@nventive.com>
Date: Fri, 17 May 2019 13:28:17 -0400
Subject: [PATCH 4/6] Adjust build.sh casing

---
 src/CalcManager/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CalcManager/build.sh b/src/CalcManager/build.sh
index 8d76ba7a..f1b2f0f3 100755
--- a/src/CalcManager/build.sh
+++ b/src/CalcManager/build.sh
@@ -8,4 +8,4 @@ emcc \
 	-s SIDE_MODULE=1 \
 	-o CalcManager.wasm \
 	-s EXPORT_ALL=1 \
-	CEngine/*.cpp RatPack/*.cpp *.cpp -I.
+	CEngine/*.cpp Ratpack/*.cpp *.cpp -I.

From 5d3a0309ce438bc135b4670d4d39fb915de15caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jerome.laban@nventive.com>
Date: Fri, 17 May 2019 14:00:22 -0400
Subject: [PATCH 5/6] Align casing (1/2)

---
 ...g => CalculatorAppList.targetsize-96_.png} | Bin
 ...orLargeTile.contrast-white_scale-400_.png} | Bin
 ...atorMedTile.contrast-white_scale-400_.png} | Bin
 ...orSmallTile.contrast-white_scale-400_.png} | Bin
 ...plashScreen.contrast-white_scale-400_.png} | Bin
 ...orStoreLogo.contrast-white_scale-200_.png} | Bin
 ...torWideTile.contrast-white_scale-400_.png} | Bin
 ...=> Date.targetsize-64_contrast-white_.png} | Bin
 ...-200.png => LockScreenLogo.scale-200_.png} | Bin
 ...grammer.targetsize-64_contrast-white_.png} | Bin
 ...entific.targetsize-64_contrast-white_.png} | Bin
 ...le-200.png => SplashScreen.scale-200_.png} | Bin
 ...0.png => Square150x150Logo.scale-200_.png} | Bin
 ...200.png => Square44x44Logo.scale-200_.png} | Bin
 ...4Logo.targetsize-24_altform-unplated_.png} | Bin
 ...tandard.targetsize-64_contrast-white_.png} | Bin
 .../Assets/{storelogo.png => StoreLogo_.png}  | Bin
 ...200.png => Wide310x150Logo.scale-200_.png} | Bin
 .../Calculator.Shared.projitems               |  36 +++++++++---------
 19 files changed, 18 insertions(+), 18 deletions(-)
 rename src/Calculator.Shared/Assets/{CalculatorAppList.targetsize-96.png => CalculatorAppList.targetsize-96_.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorLargeTile.contrast-white_scale-400.png => CalculatorLargeTile.contrast-white_scale-400_.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorMedTile.contrast-white_scale-400.png => CalculatorMedTile.contrast-white_scale-400_.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorSmallTile.contrast-white_scale-400.png => CalculatorSmallTile.contrast-white_scale-400_.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorSplashScreen.contrast-white_scale-400.png => CalculatorSplashScreen.contrast-white_scale-400_.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorStoreLogo.contrast-white_scale-200.png => CalculatorStoreLogo.contrast-white_scale-200_.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorWideTile.contrast-white_scale-400.png => CalculatorWideTile.contrast-white_scale-400_.png} (100%)
 rename src/Calculator.Shared/Assets/{Date.targetsize-64_contrast-white.png => Date.targetsize-64_contrast-white_.png} (100%)
 rename src/Calculator.Shared/Assets/{lockscreenlogo.scale-200.png => LockScreenLogo.scale-200_.png} (100%)
 rename src/Calculator.Shared/Assets/{Programmer.targetsize-64_contrast-white.png => Programmer.targetsize-64_contrast-white_.png} (100%)
 rename src/Calculator.Shared/Assets/{Scientific.targetsize-64_contrast-white.png => Scientific.targetsize-64_contrast-white_.png} (100%)
 rename src/Calculator.Shared/Assets/{splashscreen.scale-200.png => SplashScreen.scale-200_.png} (100%)
 rename src/Calculator.Shared/Assets/{square150x150logo.scale-200.png => Square150x150Logo.scale-200_.png} (100%)
 rename src/Calculator.Shared/Assets/{square44x44logo.scale-200.png => Square44x44Logo.scale-200_.png} (100%)
 rename src/Calculator.Shared/Assets/{square44x44logo.targetsize-24_altform-unplated.png => Square44x44Logo.targetsize-24_altform-unplated_.png} (100%)
 rename src/Calculator.Shared/Assets/{Standard.targetsize-64_contrast-white.png => Standard.targetsize-64_contrast-white_.png} (100%)
 rename src/Calculator.Shared/Assets/{storelogo.png => StoreLogo_.png} (100%)
 rename src/Calculator.Shared/Assets/{wide310x150logo.scale-200.png => Wide310x150Logo.scale-200_.png} (100%)

diff --git a/src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96.png b/src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96.png
rename to src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96_.png
diff --git a/src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400.png
rename to src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400_.png
diff --git a/src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400.png
rename to src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400_.png
diff --git a/src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400.png
rename to src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400_.png
diff --git a/src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400.png
rename to src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400_.png
diff --git a/src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200.png b/src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200.png
rename to src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200_.png
diff --git a/src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400.png b/src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400.png
rename to src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400_.png
diff --git a/src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white.png b/src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white.png
rename to src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white_.png
diff --git a/src/Calculator.Shared/Assets/lockscreenlogo.scale-200.png b/src/Calculator.Shared/Assets/LockScreenLogo.scale-200_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/lockscreenlogo.scale-200.png
rename to src/Calculator.Shared/Assets/LockScreenLogo.scale-200_.png
diff --git a/src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white.png b/src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white.png
rename to src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white_.png
diff --git a/src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white.png b/src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white.png
rename to src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white_.png
diff --git a/src/Calculator.Shared/Assets/splashscreen.scale-200.png b/src/Calculator.Shared/Assets/SplashScreen.scale-200_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/splashscreen.scale-200.png
rename to src/Calculator.Shared/Assets/SplashScreen.scale-200_.png
diff --git a/src/Calculator.Shared/Assets/square150x150logo.scale-200.png b/src/Calculator.Shared/Assets/Square150x150Logo.scale-200_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/square150x150logo.scale-200.png
rename to src/Calculator.Shared/Assets/Square150x150Logo.scale-200_.png
diff --git a/src/Calculator.Shared/Assets/square44x44logo.scale-200.png b/src/Calculator.Shared/Assets/Square44x44Logo.scale-200_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/square44x44logo.scale-200.png
rename to src/Calculator.Shared/Assets/Square44x44Logo.scale-200_.png
diff --git a/src/Calculator.Shared/Assets/square44x44logo.targetsize-24_altform-unplated.png b/src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/square44x44logo.targetsize-24_altform-unplated.png
rename to src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated_.png
diff --git a/src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white.png b/src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white.png
rename to src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white_.png
diff --git a/src/Calculator.Shared/Assets/storelogo.png b/src/Calculator.Shared/Assets/StoreLogo_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/storelogo.png
rename to src/Calculator.Shared/Assets/StoreLogo_.png
diff --git a/src/Calculator.Shared/Assets/wide310x150logo.scale-200.png b/src/Calculator.Shared/Assets/Wide310x150Logo.scale-200_.png
similarity index 100%
rename from src/Calculator.Shared/Assets/wide310x150logo.scale-200.png
rename to src/Calculator.Shared/Assets/Wide310x150Logo.scale-200_.png
diff --git a/src/Calculator.Shared/Calculator.Shared.projitems b/src/Calculator.Shared/Calculator.Shared.projitems
index 24599449..b251370a 100644
--- a/src/Calculator.Shared/Calculator.Shared.projitems
+++ b/src/Calculator.Shared/Calculator.Shared.projitems
@@ -226,24 +226,24 @@
   <ItemGroup>
     <Content Include="$(MSBuildThisFileDirectory)Assets\CalcMDL2.ttf" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\CalcMDL2.woff" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorAppList.targetsize-96.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorLargeTile.contrast-white_scale-400.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorMedTile.contrast-white_scale-400.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSmallTile.contrast-white_scale-400.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSplashScreen.contrast-white_scale-400.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorStoreLogo.contrast-white_scale-200.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorWideTile.contrast-white_scale-400.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Date.targetsize-64_contrast-white.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Programmer.targetsize-64_contrast-white.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Scientific.targetsize-64_contrast-white.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\SplashScreen.scale-200.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Standard.targetsize-64_contrast-white.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\StoreLogo.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Wide310x150Logo.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorAppList.targetsize-96_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorLargeTile.contrast-white_scale-400_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorMedTile.contrast-white_scale-400_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSmallTile.contrast-white_scale-400_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSplashScreen.contrast-white_scale-400_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorStoreLogo.contrast-white_scale-200_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorWideTile.contrast-white_scale-400_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Date.targetsize-64_contrast-white_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\LockScreenLogo.scale-200_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Programmer.targetsize-64_contrast-white_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Scientific.targetsize-64_contrast-white_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\SplashScreen.scale-200_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square150x150Logo.scale-200_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.scale-200_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.targetsize-24_altform-unplated_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Standard.targetsize-64_contrast-white_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\StoreLogo_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Wide310x150Logo.scale-200_.png" />
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="$(MSBuildThisFileDirectory)Resources\af-ZA\CEngineStrings.resw" />

From 52be79c3d5c8c79a263aeb9c28e3114f269f9c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jerome.laban@nventive.com>
Date: Fri, 17 May 2019 14:01:11 -0400
Subject: [PATCH 6/6] Align casing (2/2)

---
 ...ng => CalculatorAppList.targetsize-96.png} | Bin
 ...torLargeTile.contrast-white_scale-400.png} | Bin
 ...latorMedTile.contrast-white_scale-400.png} | Bin
 ...torSmallTile.contrast-white_scale-400.png} | Bin
 ...SplashScreen.contrast-white_scale-400.png} | Bin
 ...torStoreLogo.contrast-white_scale-200.png} | Bin
 ...atorWideTile.contrast-white_scale-400.png} | Bin
 ... => Date.targetsize-64_contrast-white.png} | Bin
 ...-200_.png => LockScreenLogo.scale-200.png} | Bin
 ...ogrammer.targetsize-64_contrast-white.png} | Bin
 ...ientific.targetsize-64_contrast-white.png} | Bin
 ...le-200_.png => SplashScreen.scale-200.png} | Bin
 ...0_.png => Square150x150Logo.scale-200.png} | Bin
 ...200_.png => Square44x44Logo.scale-200.png} | Bin
 ...44Logo.targetsize-24_altform-unplated.png} | Bin
 ...Standard.targetsize-64_contrast-white.png} | Bin
 .../Assets/{StoreLogo_.png => StoreLogo.png}  | Bin
 ...200_.png => Wide310x150Logo.scale-200.png} | Bin
 .../Calculator.Shared.projitems               |  36 +++++++++---------
 19 files changed, 18 insertions(+), 18 deletions(-)
 rename src/Calculator.Shared/Assets/{CalculatorAppList.targetsize-96_.png => CalculatorAppList.targetsize-96.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorLargeTile.contrast-white_scale-400_.png => CalculatorLargeTile.contrast-white_scale-400.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorMedTile.contrast-white_scale-400_.png => CalculatorMedTile.contrast-white_scale-400.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorSmallTile.contrast-white_scale-400_.png => CalculatorSmallTile.contrast-white_scale-400.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorSplashScreen.contrast-white_scale-400_.png => CalculatorSplashScreen.contrast-white_scale-400.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorStoreLogo.contrast-white_scale-200_.png => CalculatorStoreLogo.contrast-white_scale-200.png} (100%)
 rename src/Calculator.Shared/Assets/{CalculatorWideTile.contrast-white_scale-400_.png => CalculatorWideTile.contrast-white_scale-400.png} (100%)
 rename src/Calculator.Shared/Assets/{Date.targetsize-64_contrast-white_.png => Date.targetsize-64_contrast-white.png} (100%)
 rename src/Calculator.Shared/Assets/{LockScreenLogo.scale-200_.png => LockScreenLogo.scale-200.png} (100%)
 rename src/Calculator.Shared/Assets/{Programmer.targetsize-64_contrast-white_.png => Programmer.targetsize-64_contrast-white.png} (100%)
 rename src/Calculator.Shared/Assets/{Scientific.targetsize-64_contrast-white_.png => Scientific.targetsize-64_contrast-white.png} (100%)
 rename src/Calculator.Shared/Assets/{SplashScreen.scale-200_.png => SplashScreen.scale-200.png} (100%)
 rename src/Calculator.Shared/Assets/{Square150x150Logo.scale-200_.png => Square150x150Logo.scale-200.png} (100%)
 rename src/Calculator.Shared/Assets/{Square44x44Logo.scale-200_.png => Square44x44Logo.scale-200.png} (100%)
 rename src/Calculator.Shared/Assets/{Square44x44Logo.targetsize-24_altform-unplated_.png => Square44x44Logo.targetsize-24_altform-unplated.png} (100%)
 rename src/Calculator.Shared/Assets/{Standard.targetsize-64_contrast-white_.png => Standard.targetsize-64_contrast-white.png} (100%)
 rename src/Calculator.Shared/Assets/{StoreLogo_.png => StoreLogo.png} (100%)
 rename src/Calculator.Shared/Assets/{Wide310x150Logo.scale-200_.png => Wide310x150Logo.scale-200.png} (100%)

diff --git a/src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96_.png b/src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96_.png
rename to src/Calculator.Shared/Assets/CalculatorAppList.targetsize-96.png
diff --git a/src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorLargeTile.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorMedTile.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorSmallTile.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorSplashScreen.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200_.png b/src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200_.png
rename to src/Calculator.Shared/Assets/CalculatorStoreLogo.contrast-white_scale-200.png
diff --git a/src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400_.png b/src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400.png
similarity index 100%
rename from src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400_.png
rename to src/Calculator.Shared/Assets/CalculatorWideTile.contrast-white_scale-400.png
diff --git a/src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white_.png b/src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white_.png
rename to src/Calculator.Shared/Assets/Date.targetsize-64_contrast-white.png
diff --git a/src/Calculator.Shared/Assets/LockScreenLogo.scale-200_.png b/src/Calculator.Shared/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/LockScreenLogo.scale-200_.png
rename to src/Calculator.Shared/Assets/LockScreenLogo.scale-200.png
diff --git a/src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white_.png b/src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white_.png
rename to src/Calculator.Shared/Assets/Programmer.targetsize-64_contrast-white.png
diff --git a/src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white_.png b/src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white_.png
rename to src/Calculator.Shared/Assets/Scientific.targetsize-64_contrast-white.png
diff --git a/src/Calculator.Shared/Assets/SplashScreen.scale-200_.png b/src/Calculator.Shared/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/SplashScreen.scale-200_.png
rename to src/Calculator.Shared/Assets/SplashScreen.scale-200.png
diff --git a/src/Calculator.Shared/Assets/Square150x150Logo.scale-200_.png b/src/Calculator.Shared/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Square150x150Logo.scale-200_.png
rename to src/Calculator.Shared/Assets/Square150x150Logo.scale-200.png
diff --git a/src/Calculator.Shared/Assets/Square44x44Logo.scale-200_.png b/src/Calculator.Shared/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Square44x44Logo.scale-200_.png
rename to src/Calculator.Shared/Assets/Square44x44Logo.scale-200.png
diff --git a/src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated_.png b/src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated_.png
rename to src/Calculator.Shared/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white_.png b/src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white_.png
rename to src/Calculator.Shared/Assets/Standard.targetsize-64_contrast-white.png
diff --git a/src/Calculator.Shared/Assets/StoreLogo_.png b/src/Calculator.Shared/Assets/StoreLogo.png
similarity index 100%
rename from src/Calculator.Shared/Assets/StoreLogo_.png
rename to src/Calculator.Shared/Assets/StoreLogo.png
diff --git a/src/Calculator.Shared/Assets/Wide310x150Logo.scale-200_.png b/src/Calculator.Shared/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from src/Calculator.Shared/Assets/Wide310x150Logo.scale-200_.png
rename to src/Calculator.Shared/Assets/Wide310x150Logo.scale-200.png
diff --git a/src/Calculator.Shared/Calculator.Shared.projitems b/src/Calculator.Shared/Calculator.Shared.projitems
index b251370a..24599449 100644
--- a/src/Calculator.Shared/Calculator.Shared.projitems
+++ b/src/Calculator.Shared/Calculator.Shared.projitems
@@ -226,24 +226,24 @@
   <ItemGroup>
     <Content Include="$(MSBuildThisFileDirectory)Assets\CalcMDL2.ttf" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\CalcMDL2.woff" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorAppList.targetsize-96_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorLargeTile.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorMedTile.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSmallTile.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSplashScreen.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorStoreLogo.contrast-white_scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorWideTile.contrast-white_scale-400_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Date.targetsize-64_contrast-white_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\LockScreenLogo.scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Programmer.targetsize-64_contrast-white_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Scientific.targetsize-64_contrast-white_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\SplashScreen.scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square150x150Logo.scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.scale-200_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.targetsize-24_altform-unplated_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Standard.targetsize-64_contrast-white_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\StoreLogo_.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\Wide310x150Logo.scale-200_.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorAppList.targetsize-96.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorLargeTile.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorMedTile.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSmallTile.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorSplashScreen.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorStoreLogo.contrast-white_scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\CalculatorWideTile.contrast-white_scale-400.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Date.targetsize-64_contrast-white.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Programmer.targetsize-64_contrast-white.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Scientific.targetsize-64_contrast-white.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\SplashScreen.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Standard.targetsize-64_contrast-white.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\StoreLogo.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="$(MSBuildThisFileDirectory)Resources\af-ZA\CEngineStrings.resw" />