diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 9eeb664..f10d681 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -1,44 +1,67 @@
-phases:
-- phase: VS_Latest
+jobs:
+- job: VS_Latest
+ container: unoplatform/wasm-build:2.0
+
+ pool:
+ vmImage: 'ubuntu-latest'
+
variables:
- NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget
- NUGET_HTTP_CACHE_PATH: $(Agent.WorkFolder)\.nuget-http-cache
SourceLinkEnabled: false
+ DotnetRuntimePath: /usr/share/dotnet
steps:
- - task: GitVersion@3
- inputs:
- updateAssemblyInfo: false
-
- - task: NuGetToolInstaller@0
- inputs:
- versionSpec: 4.7.0
- checkLatest: false
- - task: NuGetCommand@2
+ - task: UseDotNet@2
+ displayName: 'Use .Net Core runtime 2.2.x'
inputs:
- command: restore
- solution: Quoter.sln
- selectOrConfig: select
- includeNuGetOrg: true
- verbosityRestore: Normal
+ packageType: runtime
+ version: 2.2.x
+ installationPath: '$(DotnetRuntimePath)'
- - task: MSBuild@1
+ - task: nventiveCanaryUpdater@5
+ displayName: 'Canary Update'
+ condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries')
inputs:
solution: Quoter.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
+ branchToMerge: uno
+ summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md'
+ resultFile: '$(Build.ArtifactStagingDirectory)/result.json'
+ nugetUpdaterVersion: 2.0.6
+ packageAuthor: nventive
+
+ - task: UseDotNet@2
+ displayName: 'Use .Net Core runtime 2.1.0'
+ inputs:
+ packageType: runtime
+ version: 2.1.0
+ installationPath: '$(DotnetRuntimePath)'
+
+ - task: GitVersion@5
+ inputs:
+ useConfigFile: true
+ configFilePath: gitversion.yml
+
+ - bash: |
+ cd ~
+ git clone https://github.com/emscripten-core/emsdk
+ cd emsdk
+ ./emsdk install sdk-1.39.11
+ ./emsdk activate sdk-1.39.11
+
+ displayName: 'Setup Emscripten'
+
+ - script: |
+ source ~/emsdk/emsdk_env.sh
+ cd $(build.sourcesdirectory)
+ msbuild /r /p:Configuration=Release $(build.sourcesdirectory)/src/uno/RoslynQuoter.Wasm/RoslynQuoter.Wasm.csproj "/p:InformationalVersion=$GITVERSION_INFORMATIONALVERSION"
+
+ env:
+ GITVERSION_FullSemVer: $(GITVERSION_FullSemVer)
+ displayName: 'Build Calculator'
- task: PublishBuildArtifacts@1
displayName: Publish Package Artifacts
inputs:
- pathToPublish: .\src\uno\RoslynQuoter.Wasm\bin\Release\netstandard2.0\dist
+ pathToPublish: $(build.sourcesdirectory)/src/uno/RoslynQuoter.Wasm/bin/Release/netstandard2.0/dist
artifactType: container
artifactName: RoslynQuoter-Wasm
diff --git a/Quoter.sln b/Quoter.sln
index 2c04389..b691c47 100644
--- a/Quoter.sln
+++ b/Quoter.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.128
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Quoter", "src\Quoter\Quoter.csproj", "{927AB47F-479C-423A-B21F-5DEC48533E1D}"
EndProject
@@ -21,6 +21,7 @@ Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\uno\RoslynQuoter.Shared\RoslynQuoter.Shared.projitems*{20f64aa7-d240-49d8-bc35-578e322c7279}*SharedItemsImports = 4
src\uno\RoslynQuoter.Shared\RoslynQuoter.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
+ src\uno\RoslynQuoter.Shared\RoslynQuoter.Shared.projitems*{a706d15c-b407-42a2-b6e3-b6f88ba24e7e}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
diff --git a/gitversion.yml b/gitversion.yml
new file mode 100644
index 0000000..2e05e6d
--- /dev/null
+++ b/gitversion.yml
@@ -0,0 +1,52 @@
+assembly-versioning-scheme: MajorMinorPatch
+mode: Mainline
+next-version: 0.2
+
+branches:
+ master:
+ mode: ContinuousDeployment
+ regex: master
+ tag: dev
+ increment: Minor
+
+ pull-request:
+ regex: ^(pull|pull\-requests|pr)[/-]
+ mode: ContinuousDeployment
+ tag: PullRequest
+ increment: Inherit
+
+ stable:
+ regex: release/stable/.*
+ tag: ''
+ increment: Patch
+ source-branches: ['master']
+ is-mainline: true
+
+ beta:
+ mode: ContinuousDeployment
+ regex: release/beta/.*
+ tag: 'beta'
+ increment: inherit
+ source-branches: ['master']
+
+ dev:
+ mode: ContinuousDeployment
+ regex: dev/.*?/(.*?)
+ tag: dev.{BranchName}
+ source-branches: ['master', 'release', 'projects', 'feature']
+ increment: inherit
+
+ projects:
+ tag: proj-{BranchName}
+ regex: projects/(.*?)
+ source-branches: ['master']
+ increment: inherit
+
+ feature:
+ tag: feature.{BranchName}
+ regex: feature/(.*?)
+ source-branches: ['master']
+ increment: inherit
+
+ignore:
+ sha: []
diff --git a/src/uno/RoslynQuoter.Wasm/LinkerConfig.xml b/src/uno/RoslynQuoter.Wasm/LinkerConfig.xml
index eb32839..322b6d0 100644
--- a/src/uno/RoslynQuoter.Wasm/LinkerConfig.xml
+++ b/src/uno/RoslynQuoter.Wasm/LinkerConfig.xml
@@ -10,7 +10,8 @@
-
+
+
diff --git a/src/uno/RoslynQuoter.Wasm/RoslynQuoter.Wasm.csproj b/src/uno/RoslynQuoter.Wasm/RoslynQuoter.Wasm.csproj
index 0cda3e4..a3e1b6e 100644
--- a/src/uno/RoslynQuoter.Wasm/RoslynQuoter.Wasm.csproj
+++ b/src/uno/RoslynQuoter.Wasm/RoslynQuoter.Wasm.csproj
@@ -6,7 +6,16 @@
true
$(DefineConstants);__WASM__
NU1701
+
+ true
+ InterpreterAndAOT
+
+
+
+
+
+
@@ -19,13 +28,12 @@
-
-
-
+
+
+
+
-
-
diff --git a/src/uno/RoslynQuoter.Wasm/aot-full.profile b/src/uno/RoslynQuoter.Wasm/aot-full.profile
new file mode 100644
index 0000000..785547e
Binary files /dev/null and b/src/uno/RoslynQuoter.Wasm/aot-full.profile differ