This commit is contained in:
Benjamin Cartier 2020-07-30 15:55:57 -04:00
Родитель d9da01d59c
Коммит c0a3bf2710
10 изменённых файлов: 124 добавлений и 46 удалений

Просмотреть файл

@ -31,6 +31,7 @@ variables:
iOSArtifactName: iOS
UWPArtifactName: UWP
macOSArtifactName: macOS
WASMArtifactName: WASM
# Path where packages (nuget or app packages) will be copied to.
PackageOutputPath: $(Build.ArtifactStagingDirectory)
@ -141,6 +142,19 @@ stages:
- template: build/stage-build.yml
- job: Build_Wasm
container: unoplatform/wasm-build:2.2
pool:
vmImage: 'ubuntu-18.04'
variables:
NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
SkipUnknowFrameworks: True
steps:
- template: build/stage-build-wasm.yml
- stage: Release_Nuget
# Only release when the build is not a Pull Request and it's using one of the proper release branches
condition: and(succeeded(), ne(variables['IsLightBuild'], 'true'), eq(variables['IsReleaseBranch'], 'true'))
@ -164,3 +178,11 @@ stages:
jobs:
- template: build/stage-release-testflight.yml
- stage: Release_WASM
# Only release when the build is not a Pull Request and it's using one of the proper release branches
condition: and(succeeded(), ne(variables['IsLightBuild'], 'true'), eq(variables['IsReleaseBranch'], 'true'))
dependsOn: Build
jobs:
- template: build/stage-release-wasm.yml

Просмотреть файл

@ -0,0 +1,35 @@
 steps:
- bash: |
cd ~
git clone --branch 1.39.11 https://github.com/emscripten-core/emsdk
cd emsdk
./emsdk install sdk-1.39.11
./emsdk activate sdk-1.39.11
displayName: 'Setup Emscripten'
- task: UseGitVersion@5
inputs:
versionSpec: '5.x'
updateAssemblyInfo: 'False'
- task: Bash@3
inputs:
targetType: inline
script: |
source ~/emsdk/emsdk_env.sh
msbuild /r /p:Configuration=Release /p:ApplicationVersion=$(USEGITVERSION.GITVERSION.MAJORMINORPATCH) $(build.sourcesdirectory)/src/samples/Uno.Material.Samples/Uno.Material.Samples.Wasm/Uno.Material.Samples.Wasm.csproj
- task: CopyFiles@2
displayName: 'Copy version information'
inputs:
Contents: $(build.sourcesdirectory)/src/samples/Uno.Material.Samples/Uno.Material.Samples.Wasm/Version.txt
TargetFolder: $(build.artifactstagingdirectory)
flattenFolders: true
- task: PublishBuildArtifacts@1
# https://developercommunity.visualstudio.com/content/problem/284991/public-vsts-previouw-cant-set-build-number-of-pr-b.html
condition: eq(variables['System.PullRequest.IsFork'], 'False')
inputs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: $(ArtifactName)
ArtifactType: Container

Просмотреть файл

@ -0,0 +1,20 @@
jobs:
- job: Publish_WASM
pool:
vmImage: windows-2019
steps:
- checkout: none
- task: DownloadBuildArtifacts@0
inputs:
buildType: current
downloadType: single
artifactName: $(WASMArtifactName)
- task: nventivecorp.nventive.nventive.websiteVersion.websiteVersion@5
displayName: 'Deploy Uno Material to Azure'
inputs:
WebsitePath: '$(System.ArtifactsDirectory)/$(WASMArtifactName)'
AzureSubscription: 'Uno Platform'
AzureStorageAccount: unomaterial

Просмотреть файл

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.UI.Xaml" Version="2.4.2" />
<PackageReference Include="nventive.Nimue.TargetFrameworks.Filtering" Version="0.1.0-alpha.55">
<PackageReference Include="nventive.Nimue.TargetFrameworks.Filtering" Version="0.1.0-alpha.58">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

Просмотреть файл

@ -67,17 +67,17 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="nventive.Nimue.Application.Building.Light">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Packaging">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Versioning">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
@ -190,7 +190,6 @@
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<AndroidResource Include="Resources\values-night\colors.xml" />
<AndroidAsset Include="Assets\Fonts\RobotoMono-VariableFont_wght.ttf" />

Просмотреть файл

@ -13,17 +13,17 @@
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="nventive.Nimue.Application.Building.Light">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Packaging">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Versioning">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Просмотреть файл

@ -3,6 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netstandard2.0</TargetFramework>
<WasmHead>True</WasmHead>
<NoWarn>NU1701</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@ -12,7 +13,7 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Content Include="Assets\splashscreen.png" />
<Content Include="Assets\splashscreen.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="WasmCSS\Fonts.css" />
@ -28,35 +29,35 @@
You can safely remove this ItemGroup completely.
-->
<None Include="Program.cs" />
<None Include="LinkerConfig.xml" />
<None Include="wwwroot\web.config" />
</ItemGroup>
<ItemGroup>
<!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="nventive.Nimue.Application.Building.Light" Version="0.1.0-alpha.55">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Packaging" Version="0.1.0-alpha.55">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Versioning" Version="0.1.0-alpha.55">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Uno.ShowMeTheXAML" Version="1.0.58" />
<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="1.0.58" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.0-dev.1117" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.0.0-dev.1117" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.14" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.14" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\library\Uno.Material\Uno.Material.csproj" />
</ItemGroup>
<Import Project="..\Uno.Material.Samples.Shared\Uno.Material.Samples.Shared.projitems" Label="Shared" Condition="Exists('..\Uno.Material.Samples.Shared\Uno.Material.Samples.Shared.projitems')" />
<None Include="Program.cs" />
<None Include="LinkerConfig.xml" />
<None Include="wwwroot\web.config" />
</ItemGroup>
<ItemGroup>
<!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="nventive.Nimue.Application.Building.Light" Version="0.1.0-alpha.58">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Packaging" Version="0.1.0-alpha.58">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Versioning" Version="0.1.0-alpha.58">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Uno.ShowMeTheXAML" Version="1.0.58" />
<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="1.0.58" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.0-dev.1117" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.0.0-dev.1117" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.14" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.14" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\library\Uno.Material\Uno.Material.csproj" />
</ItemGroup>
<Import Project="..\Uno.Material.Samples.Shared\Uno.Material.Samples.Shared.projitems" Label="Shared" Condition="Exists('..\Uno.Material.Samples.Shared\Uno.Material.Samples.Shared.projitems')" />
</Project>

Просмотреть файл

@ -0,0 +1 @@
1.0.0

Просмотреть файл

@ -168,17 +168,17 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="nventive.Nimue.Application.Building.Light">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Packaging">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Versioning">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

Просмотреть файл

@ -70,17 +70,17 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="nventive.Nimue.Application.Building.Light">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Packaging">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="nventive.Nimue.Application.Versioning">
<Version>0.1.0-alpha.55</Version>
<Version>0.1.0-alpha.58</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>