Maintenence/2022 updates (#49)
* Updated workflows CI and CD to use newer SDK and tolling * Updated NuGet package dependencies in the projects * Updated the target SDKs in the MSIX build.
This commit is contained in:
Lance McCarthy
GitHub
Родитель
6ddd133ba4
Коммит
fb81ac0301
|
|
@ -82,26 +82,25 @@ jobs:
|
|||
|
||||
# Use Nerdbank.GitVersioning to set version variables: https://github.com/AArnott/nbgv
|
||||
- name: Use Nerdbank.GitVersioning to set version variables
|
||||
uses: aarnott/nbgv@v0.3
|
||||
with:
|
||||
setAllVars: true
|
||||
uses: dotnet/nbgv@master
|
||||
id: nbgv
|
||||
|
||||
# Install the .NET Core workload
|
||||
- name: Install .NET Core
|
||||
uses: actions/setup-dotnet@v1
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: '3.1.302'
|
||||
dotnet-version: '6.0.x'
|
||||
|
||||
# Add MsBuild to the PATH: https://github.com/microsoft/setup-msbuild
|
||||
- name: Setup MSBuild.exe
|
||||
uses: microsoft/setup-msbuild@v1.0.1
|
||||
uses: microsoft/setup-msbuild@v1.1
|
||||
|
||||
# Update the appxmanifest before build by setting the per-channel values set in the matrix such as
|
||||
# the Package.Identity.Version or the Package.Identity.Name, which allows multiple channels to be built.
|
||||
- name: Update manifest version
|
||||
run: |
|
||||
[xml]$manifest = get-content ".\$env:Wap_Project_Directory\Package.appxmanifest"
|
||||
$manifest.Package.Identity.Version = "$env:NBGV_SimpleVersion.0"
|
||||
$manifest.Package.Identity.Version = "${{ steps.nbgv.outputs.SimpleVersion }}.0"
|
||||
$manifest.Package.Identity.Name = "${{ matrix.MsixPackageId }}"
|
||||
$manifest.Package.Identity.Publisher = "${{ matrix.MsixPublisherId }}"
|
||||
$manifest.Package.Properties.DisplayName = "${{ matrix.MsixPackageDisplayName }}"
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ on:
|
|||
push:
|
||||
branches:
|
||||
- master
|
||||
- 'maintenence/*'
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
|
|
@ -42,25 +43,24 @@ jobs:
|
|||
|
||||
# Use Nerdbank.GitVersioning to set version variables: https://github.com/AArnott/nbgv
|
||||
- name: Use Nerdbank.GitVersioning to set version variables
|
||||
uses: aarnott/nbgv@v0.3
|
||||
with:
|
||||
setAllVars: true
|
||||
uses: dotnet/nbgv@master
|
||||
id: nbgv
|
||||
|
||||
# Install the .NET Core workload
|
||||
- name: Install .NET Core
|
||||
uses: actions/setup-dotnet@v1
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: '3.1.302'
|
||||
dotnet-version: '6.0.x'
|
||||
|
||||
# Add MsBuild to the PATH: https://github.com/microsoft/setup-msbuild
|
||||
- name: Setup MSBuild.exe
|
||||
uses: microsoft/setup-msbuild@v1.0.1
|
||||
uses: microsoft/setup-msbuild@v1.1
|
||||
|
||||
# Update the version before build
|
||||
- name: Update manifest version
|
||||
run: |
|
||||
[xml]$manifest = get-content ".\$env:Wap_Project_Directory\Package.appxmanifest"
|
||||
$manifest.Package.Identity.Version = "$env:NBGV_SimpleVersion.0"
|
||||
$manifest.Package.Identity.Version = "${{ steps.nbgv.outputs.SimpleVersion }}.0"
|
||||
$manifest.save(".\$env:Wap_Project_Directory\Package.appxmanifest")
|
||||
|
||||
# Test
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>0536b61a-90cf-428d-b4f8-cf011b3a0830</ProjectGuid>
|
||||
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
|
||||
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
|
||||
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
|
||||
<DefaultLanguage>en-US</DefaultLanguage>
|
||||
<!-- True/false. Sign the output packages. Default is true. -->
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<Identity
|
||||
Name="MyWPFApp.DevOpsDemo.Local"
|
||||
Publisher="CN=GitHubActionsDemo"
|
||||
Version="0.0.2.0" />
|
||||
Version="0.0.3.0" />
|
||||
|
||||
<Properties>
|
||||
<DisplayName>MyWPFApp (Local)</DisplayName>
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@
|
|||
<PlatformTarget>$(Platform)</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AppInsights.WindowsDesktop" Version="2.10.55" />
|
||||
<PackageReference Include="Nerdbank.GitVersioning" Version="3.0.50" PrivateAssets="all" />
|
||||
<PackageReference Include="OSVersionHelper" Version="1.0.11" />
|
||||
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000-preview" />
|
||||
<PackageReference Include="AppInsights.WindowsDesktop" Version="2.18.1" />
|
||||
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" PrivateAssets="all" />
|
||||
<PackageReference Include="OSVersionHelper" Version="1.1.24" />
|
||||
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22621.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="nunit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
|
||||
<PackageReference Include="nunit" Version="3.13.3" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче