diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 62bd48d..19383df 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - uses: actions/cache@v3 with: path: ~/.nuget/win-packages @@ -47,7 +47,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - uses: actions/cache@v3 with: path: ~/.nuget/win-packages @@ -77,7 +77,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - uses: actions/cache@v3 with: path: ~/.nuget/macos-arm-packages @@ -108,7 +108,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - uses: actions/cache@v3 with: path: ~/.nuget/linux-packages diff --git a/KeyVaultExplorer/KeyVaultExplorer.csproj b/KeyVaultExplorer/KeyVaultExplorer.csproj index fc7a133..c700ada 100644 --- a/KeyVaultExplorer/KeyVaultExplorer.csproj +++ b/KeyVaultExplorer/KeyVaultExplorer.csproj @@ -1,7 +1,7 @@  net10.0 - $(TargetFrameworks);net9.0-windows10.0.19041.0 + $(TargetFrameworks);net10.0-windows10.0.19041.0 10.0.19041.41 diff --git a/build.ps1 b/build.ps1 index 94efa0b..10b66e5 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,8 +3,8 @@ param( [string]$BuildNumber = '1.0.0.0', $VersionPrefix = "1.0.0", $VersionSuffix = "99", - [ValidateSet('net9.0', 'net9.0-windows10.0.19041.0', "net9.0-macos")] - [string]$Platform = 'net9.0', + [ValidateSet('net10.0', 'net10.0-windows10.0.19041.0', "net10.0-macos")] + [string]$Platform = 'net10.0', [ValidateSet('win-x64', 'win-arm64', 'osx-x64', 'osx-arm64', 'linux-x64')] [string]$Runtime = 'win-x64', [Switch]$CreateMacOSBundle = $false @@ -81,6 +81,6 @@ if ($Runtime -eq "osx-x64") { # mpdev build .\msix.json # Push-Location 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64' # Push-Location 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\arm64' -# .\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" -# .\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" +# .\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" +# .\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"