-
Notifications
You must be signed in to change notification settings - Fork 433
FI main into WNP_ToastNotifications #1964
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
loneursid
merged 1 commit into
feature/WNP_ToastNotifications
from
user/erlangl/WNP_ToastNotifications_FI
Jan 12, 2022
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
eng/common/AzurePipelinesTemplates/WindowsAppSDK-BuildAndIntegrationTest-Steps.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # This yml template combines WindowsAppSDK-BuildSetup, WindowsAppSDK-Build, | ||
| # and WindowsAppSDK-IntegrationTest templatesfor running the testAll script in ProjectReunionInternal | ||
| parameters: | ||
| - name: TransportPackageArtifactName | ||
| type: string | ||
| default: '' | ||
| - name: AzureSubscriptionServiceConnection | ||
| type: string | ||
| default: 'ProjectReunion Resource Manager' | ||
| - name: NuGetServiceConnectionName | ||
| type: string | ||
| default: 'ProjectReunionInternal' | ||
| - name: BuildType | ||
| displayName: "Build Type" | ||
| type: string | ||
| default: 'stable' | ||
| values: | ||
| - 'stable' | ||
| - 'experimental' | ||
| - name: "TransportPackages" | ||
| displayName: "TransportPackages to replace (name:version)" | ||
| type: object | ||
| default: | ||
| Foundation: | ||
| name: Microsoft.WindowsAppSDK.Foundation.TransportPackage | ||
| version: 1.0.0-stable | ||
| - name: TestSelection | ||
| type: string | ||
| default: "*" | ||
|
|
||
| steps: | ||
| - template: WindowsAppSDK-BuildSetup-Steps.yml | ||
| parameters: | ||
| AzureSubscriptionServiceConnection: ${{ parameters.AzureSubscriptionServiceConnection }} | ||
| NuGetServiceConnectionName: ${{ parameters.NuGetServiceConnectionName }} | ||
|
|
||
| - template: WindowsAppSDK-Build-Steps.yml | ||
| parameters: | ||
| TransportPackageArtifactName: ${{ parameters.TransportPackageArtifactName }} | ||
| BuildType: ${{ parameters.BuildType }} | ||
| TransportPackages: ${{ parameters.TransportPackages }} | ||
|
|
||
| - template: WindowsAppSDK-IntegrationTest-Steps.yml | ||
| parameters: | ||
| TestSelection: ${{ parameters.TestSelection }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
eng/common/AzurePipelinesTemplates/WindowsAppSDK-IntegrationTest-Steps.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| # This yml template is for running the testAll script in ProjectReunionInternal | ||
| # It downloads the WindowsAppSDK NuGetPackage from WindowsAppSDKNugetPackage (by default) | ||
| # | ||
| # Requirements: | ||
| # - This yml template can only be called from a pipeline in the "microsoft" AzureDevOps | ||
| # - Only the ProjectReunionInternal repository is checkout in the job | ||
| # | ||
| # The template eng\common\AzurePipelinesTemplates\WindowsAppSDK-BuildSetup-Steps.yml | ||
| # will facilitate setting up the requirements to sucessfully run this template. | ||
| # eng\common\AzurePipelinesTemplates\WindowsAppSDK-Build-Steps.yml will build the | ||
| # WindowsAppSDK Nuget Package for this template to use. | ||
| # | ||
| # In most cases, WindowsAppSDK-BuildSetup-Steps.yml should be called first, | ||
| # then WindowsAppSDK-Build-Steps.yml, and finally WindowsAppSDK-IntegrationTest-Steps.yml | ||
| # | ||
| # Parameters: | ||
| # WinAppSDkPackageArtifactName | ||
| # Name of the Artifact where the WindowsAppSDK NuGetPackage for the build lives | ||
|
|
||
| parameters: | ||
| - name: WinAppSDkPackageArtifactName | ||
| type: string | ||
| default: "WindowsAppSDKNugetPackage" | ||
| - name: TestSelection | ||
| type: string | ||
| default: "*" | ||
|
|
||
| steps: | ||
| - task: DownloadBuildArtifacts@0 | ||
| inputs: | ||
| artifactName: ${{ parameters.WinAppSDkPackageArtifactName }} | ||
| downloadPath: '$(Build.SourcesDirectory)\temp' | ||
| itemPattern: | | ||
| **/Microsoft.WindowsAppSDK.*.nupkg | ||
|
|
||
| - task: PowerShell@2 | ||
| displayName: Extract WindowsAppSDKVersion | ||
| inputs: | ||
| targetType: 'inline' | ||
| script: | | ||
| Copy-Item -Path "$(Build.SourcesDirectory)\temp" -Destination "$(Build.SourcesDirectory)\PackLocation" -Recurse | ||
|
|
||
| $files = Get-ChildItem $(Build.SourcesDirectory)\temp | ||
| foreach ($file in $files) # Iterate through each package we restored in the directory | ||
| { | ||
| Write-Host "file:" $file.FullName | ||
| $nupkgPaths = Get-ChildItem $file.FullName -Filter "*.nupkg" | ||
|
|
||
| # Extract nupkg to access the nuspec | ||
| # The files in this directory does not contain the nuspec by default | ||
| foreach ($nupkgPath in $nupkgPaths) | ||
| { | ||
| Write-Host "nupkgPath:" $nupkgPath.FullName | ||
| $rename = $nupkgPath.Name + ".zip" | ||
| Rename-Item $nupkgPath.FullName $rename | ||
| $renamedFilePath = $nupkgPath.FullName + ".zip" | ||
| $dest = $file.FullName + "/contents" | ||
| Expand-Archive $renamedFilePath -Destination $dest | ||
| } | ||
|
|
||
| $nuspecPaths = Get-ChildItem $file.FullName -Recurse -Filter "*.nuspec" | ||
| foreach ($nuspecPath in $nuspecPaths) | ||
| { | ||
| Write-Host "Found Nuspecs" | ||
| [xml]$nuspec = Get-Content -Path $nuspecPath.FullName | ||
| if ($nuspec.package.metadata.id -eq 'Microsoft.WindowsAppSDK') | ||
| { | ||
| $version = $nuspec.package.metadata.version | ||
| Write-Host "Found " $version | ||
| Write-Host "##vso[task.setvariable variable=WindowsAppSDKPackageVersion;]$version" | ||
| Exit 0 | ||
| } | ||
| } | ||
| } | ||
| Exit 1 | ||
|
|
||
| - task: PowerShell@2 | ||
| name: TestAll | ||
| displayName: TestAll | ||
| inputs: | ||
| filePath: 'TestAll.ps1' | ||
| arguments: > | ||
| -WindowsAppSDKPackageVersion "$(WindowsAppSDKPackageVersion)" | ||
| -Checkpoint "none" -Platform "x64" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since you seem to be doing 1 arg per line move -Platform to its own line |
||
| -Configuration "release" | ||
| -YamlStep "none" | ||
| -RunTestMachineSetup | ||
| -Name "${{ parameters.TestSelection }}" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| { | ||
| "tools": { | ||
| "dotnet": "6.0.100" | ||
| "dotnet": "6.0.101" | ||
| }, | ||
| "msbuild-sdks": { | ||
| "Microsoft.WinAppSDK.EngCommon": "1.0.0-20211213.0-CI" | ||
| "Microsoft.WinAppSDK.EngCommon": "1.0.0-20220110.0-CI" | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why separate lines when 1 line is used when there's a value e.g. line 28