Adjust versioning (#147)
* fix: Adjust versioning * chore: replace version in target files * chore: Adjust version replace * chore: Adjust version replace * chore: Adjust replace
This commit is contained in:
Jérôme Laban
GitHub
Родитель
3adc65b123
Коммит
86f7aaca0a
|
|
@ -27,17 +27,16 @@ What kind of change does this PR introduce?
|
|||
|
||||
<!-- Please describe the new behavior after your modifications. -->
|
||||
|
||||
|
||||
## PR Checklist
|
||||
|
||||
Please check if your PR fulfills the following requirements:
|
||||
|
||||
- [ ] Tested code with current [supported SDKs](../README.md#supported)
|
||||
- [ ] Docs have been added/updated which fit [documentation template](https://github.com/nventive/Uno/blob/master/doc/.feature-template.md). (for bug fixes / features)
|
||||
- [ ] Docs have been added/updated which fit [documentation template](https://github.com/unoplatform/Uno/blob/master/doc/.feature-template.md). (for bug fixes / features)
|
||||
- [ ] [Unit Tests and/or UI Tests](doc/articles/working-with-the-samples-apps.md) for the changes have been added (for bug fixes / features) (if applicable)
|
||||
- [ ] [Wasm UI Tests](doc/articles/working-with-the-samples-apps.md#running-the-webassembly-ui-tests-snapshots) are not showing unexpected any differences. Validate PR `Screenshots Compare Test Run` results.
|
||||
- [ ] Contains **NO** breaking changes
|
||||
- [ ] Updated the [Release Notes](https://github.com/nventive/Uno/tree/master/doc/ReleaseNotes)
|
||||
- [ ] Updated the [Release Notes](https://github.com/unoplatform/Uno/tree/master/doc/ReleaseNotes)
|
||||
- [ ] Associated with an issue (GitHub or internal)
|
||||
|
||||
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below.
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ repository:
|
|||
|
||||
has_downloads: true
|
||||
|
||||
default_branch: master
|
||||
default_branch: main
|
||||
|
||||
allow_squash_merge: true
|
||||
allow_merge_commit: false
|
||||
|
|
@ -178,7 +178,7 @@ labels:
|
|||
# oldname: Help Wanted
|
||||
|
||||
branches:
|
||||
- name: master
|
||||
- name: main
|
||||
# https://developer.github.com/v3/repos/branches/#update-branch-protection
|
||||
# Branch Protection settings. Set to null to disable
|
||||
protection:
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ name: Conventional Commits
|
|||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
- release/*
|
||||
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@ name: runtime CI
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
- release/**
|
||||
|
||||
pull_request:
|
||||
types: [opened, synchronize, reopened, closed]
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
- release/**
|
||||
|
||||
env:
|
||||
|
|
@ -363,8 +363,13 @@ jobs:
|
|||
- name: Create NuGet SDK Packages
|
||||
run: |
|
||||
cd nuget
|
||||
ls -la
|
||||
|
||||
# Adjust version numbers for target files
|
||||
sed -i "s/\\\$buildversion\\\$/${{ steps.gitversion.outputs.semVer }}/g" runtime/*.*
|
||||
|
||||
# Unzip all packages in separate folders
|
||||
find . -name '*.zip' -exec sh -c 'unzip -d "${1%.*}" "$1"' _ {} \;
|
||||
|
||||
dotnet pack Uno.NETCore.App.Runtime.Mono.browser-wasm.csproj /p:OutputPath=$GITHUB_WORKSPACE/ci-output "/p:Version=${{ steps.gitversion.outputs.semVer }}"
|
||||
|
||||
- uses: actions/upload-artifact@v2
|
||||
|
|
@ -375,7 +380,7 @@ jobs:
|
|||
|
||||
sign:
|
||||
name: Sign Package
|
||||
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
|
||||
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) }}
|
||||
runs-on: windows-latest
|
||||
needs: [package_job,build_aot_windows_job,build_aot_linux_job]
|
||||
steps:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pull_request_rules:
|
||||
- name: automatic strict merge when CI passes, has 2 reviews, no requests for change and is labeled 'ready-to-merge' unless labelled 'do-not-merge/breaking-change' or 'do-not-merge/work-in-progress'
|
||||
conditions:
|
||||
# Only pull-requests sent to the master branch
|
||||
- base=master
|
||||
# Only pull-requests sent to the main branch
|
||||
- base=main
|
||||
|
||||
# All Azure builds should be green:
|
||||
- status-success=Uno.UI - CI
|
||||
|
|
|
|||
|
|
@ -2,41 +2,41 @@
|
|||
|
||||
<!-- Property overrides -->
|
||||
<PropertyGroup>
|
||||
<_BaseTasksDir>$(MSBuildThisFileDirectory)../data/singlethread/</_BaseTasksDir>
|
||||
<_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_BaseTasksDir)..\tasks\net9.0\</_TasksDir>
|
||||
<_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(_BaseTasksDir)..\tasks\net472\</_TasksDir>
|
||||
<_UnoNetCoreAppRuntimeBasePath>$(MSBuildThisFileDirectory)../data/singlethread/</_UnoNetCoreAppRuntimeBasePath>
|
||||
<_UnoNetCoreAppRuntimeTaskPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_UnoNetCoreAppRuntimeBasePath)..\tasks\net9.0\</_UnoNetCoreAppRuntimeTaskPath>
|
||||
<_UnoNetCoreAppRuntimeTaskPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(_UnoNetCoreAppRuntimeBasePath)..\tasks\net472\</_UnoNetCoreAppRuntimeTaskPath>
|
||||
|
||||
<WasmAppBuilderTasksAssemblyPath>$(_TasksDir)WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
|
||||
<WasmBuildTasksAssemblyPath>$(_TasksDir)WasmBuildTasks.dll</WasmBuildTasksAssemblyPath>
|
||||
<WasmAppHostDir>$([MSBuild]::NormalizeDirectory($(_BaseTasksDir), '..', 'WasmAppHost'))</WasmAppHostDir>
|
||||
<WasmAppBuilderTasksAssemblyPath>$(_UnoNetCoreAppRuntimeTaskPath)WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
|
||||
<WasmBuildTasksAssemblyPath>$(_UnoNetCoreAppRuntimeTaskPath)WasmBuildTasks.dll</WasmBuildTasksAssemblyPath>
|
||||
<WasmAppHostDir>$([MSBuild]::NormalizeDirectory($(_UnoNetCoreAppRuntimeBasePath), '..', 'WasmAppHost'))</WasmAppHostDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="$(_BaseTasksDir)\build\Microsoft.NET.Sdk.WebAssembly.Browser.props"/>
|
||||
<Import Project="$(_UnoNetCoreAppRuntimeBasePath)\build\Microsoft.NET.Sdk.WebAssembly.Browser.props"/>
|
||||
|
||||
<PropertyGroup>
|
||||
<MicrosoftNetCoreAppRuntimePackDir>$(_BaseTasksDir)runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackDir>
|
||||
<MicrosoftNetCoreAppRuntimePackRidDir>$(_BaseTasksDir)runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackRidDir>
|
||||
<MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$(_BaseTasksDir)runtimes\browser-wasm\lib\net9.0\</MicrosoftNetCoreAppRuntimePackRidLibTfmDir>
|
||||
<MicrosoftNetCoreAppRuntimePackDir>$(_UnoNetCoreAppRuntimeBasePath)runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackDir>
|
||||
<MicrosoftNetCoreAppRuntimePackRidDir>$(_UnoNetCoreAppRuntimeBasePath)runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackRidDir>
|
||||
<MicrosoftNetCoreAppRuntimePackRidLibTfmDir>$(_UnoNetCoreAppRuntimeBasePath)runtimes\browser-wasm\lib\net9.0\</MicrosoftNetCoreAppRuntimePackRidLibTfmDir>
|
||||
|
||||
<WasmAppBuilderTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_BaseTasksDir)tasks\net9.0\WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
|
||||
<WasmAppBuilderTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(_BaseTasksDir)tasks\net472\WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
|
||||
<WasmAppBuilderTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(_UnoNetCoreAppRuntimeBasePath)tasks\net9.0\WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
|
||||
<WasmAppBuilderTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(_UnoNetCoreAppRuntimeBasePath)tasks\net472\WasmAppBuilder.dll</WasmAppBuilderTasksAssemblyPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Don't import to avoid including official wasm workloads
|
||||
<Import Project="$(_BaseTasksDir)\Sdk\BrowserWasmApp.props"/>
|
||||
<Import Project="$(_UnoNetCoreAppRuntimeBasePath)\Sdk\BrowserWasmApp.props"/>
|
||||
-->
|
||||
|
||||
<ItemGroup>
|
||||
<RuntimePack
|
||||
Include="Uno.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
NuGetPackageVersion="9.0-dev.1"
|
||||
NuGetPackageVersion="$buildversion$"
|
||||
FrameworkName="Microsoft.NETCore.App"
|
||||
PackageDirectory="$(_BaseTasksDir)"
|
||||
PackageDirectory="$(_UnoNetCoreAppRuntimeBasePath)"
|
||||
RuntimeIdentifier="browser-wasm"
|
||||
NuGetPackageId="Uno.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
IsTrimmable=""
|
||||
/>
|
||||
/>
|
||||
|
||||
<PackageConflictPreferredPackages Include="Uno.NETCore.App.Runtime.Mono.browser-wasm" />
|
||||
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
<FrameworkReference Remove="Microsoft.AspNetCore.App" IsImplicitlyDefined="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="$(_BaseTasksDir)Sdk\MonoTargetsTasks.props"/>
|
||||
<Import Project="$(_BaseTasksDir)Sdk\WasmApp.Common.props"/>
|
||||
<Import Project="$(_UnoNetCoreAppRuntimeBasePath)Sdk\MonoTargetsTasks.props"/>
|
||||
<Import Project="$(_UnoNetCoreAppRuntimeBasePath)Sdk\WasmApp.Common.props"/>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
<PropertyGroup>
|
||||
|
||||
<!-- Import like an SDK targets file (e.g. after the .NET SDK targets have been evaluated) -->
|
||||
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_BaseTasksDir)\build\Microsoft.NET.Sdk.WebAssembly.Browser.targets</AfterMicrosoftNETSdkTargets>
|
||||
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_BaseTasksDir)\Sdk\BrowserWasmApp.targets</AfterMicrosoftNETSdkTargets>
|
||||
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_UnoNetCoreAppRuntimeBasePath)\build\Microsoft.NET.Sdk.WebAssembly.Browser.targets</AfterMicrosoftNETSdkTargets>
|
||||
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(_UnoNetCoreAppRuntimeBasePath)\Sdk\BrowserWasmApp.targets</AfterMicrosoftNETSdkTargets>
|
||||
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче