diff --git a/.vsts-ci.Linux.yml b/.vsts-ci.Linux.yml new file mode 100644 index 00000000..2563255e --- /dev/null +++ b/.vsts-ci.Linux.yml @@ -0,0 +1,60 @@ +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 + chmod +x build.sh + ./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 diff --git a/src/CalcManager/build.sh b/src/CalcManager/build.sh old mode 100644 new mode 100755 index 8d76ba7a..f1b2f0f3 --- 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. 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/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/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/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 @@ - +