Skip to content

Commit 31b7f6e

Browse files
update .net versions (#138)
1 parent df19986 commit 31b7f6e

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/dotnet.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup .NET
1818
uses: actions/setup-dotnet@v4
1919
with:
20-
dotnet-version: 9.0.x
20+
dotnet-version: 10.0.x
2121
- uses: actions/cache@v3
2222
with:
2323
path: ~/.nuget/win-packages
@@ -47,7 +47,7 @@ jobs:
4747
- name: Setup .NET
4848
uses: actions/setup-dotnet@v4
4949
with:
50-
dotnet-version: 9.0.x
50+
dotnet-version: 10.0.x
5151
- uses: actions/cache@v3
5252
with:
5353
path: ~/.nuget/win-packages
@@ -77,7 +77,7 @@ jobs:
7777
- name: Setup .NET
7878
uses: actions/setup-dotnet@v4
7979
with:
80-
dotnet-version: 9.0.x
80+
dotnet-version: 10.0.x
8181
- uses: actions/cache@v3
8282
with:
8383
path: ~/.nuget/macos-arm-packages
@@ -108,7 +108,7 @@ jobs:
108108
- name: Setup .NET
109109
uses: actions/setup-dotnet@v4
110110
with:
111-
dotnet-version: 9.0.x
111+
dotnet-version: 10.0.x
112112
- uses: actions/cache@v3
113113
with:
114114
path: ~/.nuget/linux-packages

KeyVaultExplorer/KeyVaultExplorer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net10.0</TargetFrameworks>
4-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
55
<WindowsSdkPackageVersion>10.0.19041.41</WindowsSdkPackageVersion>
66

77
<!-- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('osx'))">$(TargetFrameworks);net8.0-macos</TargetFrameworks> -->

build.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ param(
33
[string]$BuildNumber = '1.0.0.0',
44
$VersionPrefix = "1.0.0",
55
$VersionSuffix = "99",
6-
[ValidateSet('net9.0', 'net9.0-windows10.0.19041.0', "net9.0-macos")]
7-
[string]$Platform = 'net9.0',
6+
[ValidateSet('net10.0', 'net10.0-windows10.0.19041.0', "net10.0-macos")]
7+
[string]$Platform = 'net10.0',
88
[ValidateSet('win-x64', 'win-arm64', 'osx-x64', 'osx-arm64', 'linux-x64')]
99
[string]$Runtime = 'win-x64',
1010
[Switch]$CreateMacOSBundle = $false
@@ -81,6 +81,6 @@ if ($Runtime -eq "osx-x64") {
8181
# mpdev build .\msix.json
8282
# Push-Location 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64'
8383
# Push-Location 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\arm64'
84-
# .\makeappx.exe unpack /v /p "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Key Vault Explorer 1.0.302.0.msix" /d "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Unpacked"
85-
# .\makeappx.exe pack /v /d "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Unpacked" /p "C:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\KeyVaultExplorerforAzure_1302x86.msix"
84+
# .\makeappx.exe unpack /v /p "x:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Key Vault Explorer 1.0.314.0.msix" /d "x:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Unpacked"
85+
# .\makeappx.exe pack /v /d "x:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\Unpacked" /p "x:\repos\AzureKeyVaultExplorer\mpdev\Key Vault Explorer\output\KeyVaultExplorerforAzure_1314x86.msix"
8686

0 commit comments

Comments
 (0)