Skip to content

Commit

Permalink
merge from release branch
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromelaban committed May 29, 2024
2 parents 33a026c + e77806a commit d4e1e2c
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/success-story.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ labels: kind/consumer-experience, kind/documentation, triage/untriaged
We 💖 to hear about how, where and what you're doing with Uno. Sharing this information is one of the kindest things you can do in open-source and the maintainers love hearing about success stories. Instead of raising a new GitHub issue could you please comment in the existing thread?
https://github.com/nventive/Uno/issues/18#issuecomment-494887105
https://github.com/unoplatform/Uno/issues/18#issuecomment-494887105
If you are feeling extra generous, how about authoring up a blog post and then letting us know about it so that we can retweet it?
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ If you're looking for help, check [Stack Overflow](https://stackoverflow.com/que
You can also post your question in the [Uno gitter room](https://gitter.im/uno-platform/Lobby) or [on Twitter using the #unoplatform](https://twitter.com/search?q=%23unoplatform) hashtag.
For organizations that want a deeper level of support beyond our community support, please [contact us](https://platform.uno/contact/). Our professional support is more than a contract – it is a shared responsibility for your project success. Our engineering team will collaborate with you to ensure the success of your projects, and our custom application development team at nventive is also available to lend its expertise.
For organizations that want a deeper level of support beyond our community support, please [contact us](https://platform.uno/contact/). Our professional support is more than a contract – it is a shared responsibility for your project success. Our engineering team will collaborate with you to ensure the success of your projects, and our custom application development team at unoplatform is also available to lend its expertise.
If the matter is security related, please disclose it privately via https://github.com/nventive/Uno/security/ -->
If the matter is security related, please disclose it privately via https://github.com/unoplatform/uno/security/ -->
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ What kind of change does this PR introduce?
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.
Expand Down
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ What kind of change does this PR introduce?
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.
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,19 +217,23 @@ jobs:
- build-extensions

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Download Artifacts
uses: actions/download-artifact@v2
with:
name: extensions
path: artifacts

- name: Install tfx
working-directory: extensions/azuredevops
run: npm install tfx-cli@0.7.x -g --no-audit --no-fund

- name: Publish to VS Marketplace
shell: pwsh
run: |
dotnet tool update -g dotnet-vs
$vsix = Get-ChildItem -Path .\artifacts -Filter *.vsix | Select-Object -First 1
& "$(vs where release --prop=InstallationPath)/VSSDK/VisualStudioIntegration/Tools/Bin/VsixPublisher.exe" publish `
-payload "$vsix" `
-publishManifest "extensions/azuredevops/vss-extension.json" `
-personalAccessToken "${{ secrets.VS_VSIX_PAT }}"
tfx extension publish --vsix "$vsix" --no-wait-validation -t "${{ secrets.VS_VSIX_PAT }}"
2 changes: 1 addition & 1 deletion extensions/azuredevops/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# unoplatform-Build-Tools

This is the code for the [unoplatform Build Tools](https://marketplace.visualstudio.com/items?itemName=nventivecorp.unoplatform) Azure Pipelines extension.
This is the code for the [Uno Build Tools](https://marketplace.visualstudio.com/items?itemName=nventivecorp.unoplatform) Azure Pipelines extension.

## Features

Expand Down
Binary file modified extensions/azuredevops/canaryUpdater/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions extensions/azuredevops/canaryUpdater/task.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"id": "95170664-b64e-4571-9cd4-936b3a626292",
"name": "nventiveCanaryUpdater",
"id": "32CDFE1A-1E67-47B5-9195-FEDBFC338DB9",
"name": "unoplatformCanaryUpdater",
"friendlyName": "Canary Updater",
"description": "A task to update a Canary build. The update is split in 3 phases :\n - Optional: merge of the canary branch with a given target branch (usually master) \n - Update of the NuGet packages; the versions used by the updater are calculated through the branch name (canaries/dev for dev, canaries/beta+dev for beta and stable, etc.); stable is always appended to the versions. \n - Optional: commit the changes and push the changes.",
"helpMarkDown": "[unoplatform](http://www.unoplatform.com/)",
"helpMarkDown": "[unoplatform](http://platform.uno/docs)",
"category": "Build",
"author": "unoplatform",
"version": {
Expand Down Expand Up @@ -210,7 +210,7 @@
"type": "string",
"label": "NuGet Updater version",
"groupName": "updater",
"defaultValue": "2.1.1",
"defaultValue": "1.0.0",
"required": true,
"helpMarkDown": "The of the NuGet updater to use. See https://www.nuget.org/packages/unoplatform.nuget.updater.tool for the list of available versions",
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion extensions/azuredevops/canaryUpdater/task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ async function installNuGetUpdater(): Promise<boolean> {
let dotnet = tl.tool(dotnetPath);

let installationTool = dotnet
.arg([ "tool", "install", "unoplatform.NuGet.Updater.Tool", "--version", toolVersion, "--tool-path", tl.getVariable("Agent.TempDirectory"), "--ignore-failed-sources" ]);
.arg([ "tool", "install", "Uno.NuGet.Updater.Tool", "--version", toolVersion, "--tool-path", tl.getVariable("Agent.TempDirectory"), "--ignore-failed-sources" ]);

await installationTool.exec(<IExecOptions>{ outStream: getConsoleStream(false) });

Expand Down
Binary file modified extensions/azuredevops/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 17 additions & 9 deletions extensions/azuredevops/vss-extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,26 @@
"manifestVersion": 1,
"id": "unoplatform-build-tools",
"version": "0.0.0",
"name": "unoplatform Build Tools",
"name": "Uno Platform Build Tools",
"description": "The Canary Updater tool by Uno Platform",
"publisher": "unoplatform",
"public": true,
"tags": [
"Extension",
"Marketplace",
"Package",
"Install",
"Build",
"Azure Pipelines",
"Azure DevOps Extensions"
],
"targets": [
{
"id": "Microsoft.VisualStudio.Services"
}
],
"categories": [
"Build and release"
"Azure Pipelines"
],
"icons": {
"default": "logo.png"
Expand All @@ -21,10 +31,10 @@
"path": "overview.md"
}
},
"repository": {
"type": "git",
"uri": "https://github.com/unoplatform/nuget.updater"
},
"repository": {
"type": "git",
"uri": "https://github.com/unoplatform/nuget.updater"
},
"contributions": [
{
"id": "unoplatform.canaryUpdater",
Expand All @@ -37,9 +47,7 @@
}
}
],
"scopes": [
"vso.work"
],
"scopes": [],
"files": [
{
"path": "canaryUpdater"
Expand Down

0 comments on commit d4e1e2c

Please sign in to comment.