diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..d7abd2f7 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,39 @@ +name: ci + +on: + push: + branches: + - main + - develop + pull_request: + branches: + - develop + +jobs: + windows-latest: + name: windows-latest + runs-on: windows-latest + steps: + - uses: actions/checkout@v1 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: | + 5.x + - name: Install Windows SDK version (18362) + uses: GuillaumeFalourd/setup-windows10-sdk-action@v2 + - name: List dotnet sdks + run: dotnet --info + - name: Run the Cake script + uses: cake-build/cake-action@v1 + with: + cake-version: tool-manifest + verbosity: Normal + script-path: build.cake + target: ci + env: + azure-key-vault-url: ${{ secrets.AZURE_KEY_VAULT_URL }} + azure-key-vault-client-id: ${{ secrets.AZURE_KEY_VAULT_CLIENT_ID }} + azure-key-vault-tenant-id: ${{ secrets.AZURE_KEY_VAULT_TENANT_ID }} + azure-key-vault-client-secret: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }} + azure-key-vault-certificate: ${{ secrets.AZURE_KEY_VAULT_CERTIFICATE }} diff --git a/README.md b/README.md index 2dc820b8..b84bbbf7 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Awesome icon packs for WPF and UWP in one library

- Supporting .NET Framework 4.5+, .NET Core 3 (3.0 and 3.1), .NET 5 (on Windows) and UWP + Supporting .NET Framework >= 4.6.2, >= .NET Core 3.1, >= .NET 5 (on Windows) and UWP (uap10.0.18362)

diff --git a/appveyor.yml b/appveyor.yml index b8f89969..0eb8eebb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,21 +21,21 @@ environment: skip_tags: true image: Visual Studio 2022 -test: off +test: false -install: - # Install Windows SDK 10.0.16299 and .NET 5 - - ps: .\build\Install-WindowsSDK.ps1 - # - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' - # - ps: ./dotnet-install.ps1 -Version 6.0.100 -InstallDir "C:\Program Files\dotnet" +# install: +# Install Windows SDK 10.0.18362 +# - ps: .\build\Install-WindowsSDK.ps1 +# - ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' +# - ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet" pull_requests: do_not_increment_build_number: false build_script: - - ps: dotnet --list-sdks + - ps: dotnet --info - ps: gitversion /version - - ps: .\build.ps1 --target=appveyor + - ps: .\build.ps1 --target=ci artifacts: - path: \Publish\*.* @@ -45,4 +45,4 @@ nuget: skip_commits: files: - - '**/*.md' + - "**/*.md" diff --git a/build.cake b/build.cake index 79b4af01..5eda557f 100644 --- a/build.cake +++ b/build.cake @@ -282,21 +282,11 @@ void SignNuGet(string publishDir) } } -Task("Zip") - .Does(() => -{ - EnsureDirectoryExists(PACKAGE_DIR); - Zip($"./src/MahApps.Metro.IconPacks.Browser/bin/{configuration}/", $"{PACKAGE_DIR.ToString()}/IconPacks.Browser.{configuration}-v" + gitVersion.NuGetVersion + ".zip"); -}); - Task("Sign") .WithCriteria(() => !isPullRequest) .ContinueOnError() .Does(() => { - var files = GetFiles("./src/MahApps.Metro.IconPacks.Browser/**/bin/**/*.exe"); - SignFiles(files, "IconPacks Browser.", "https://github.com/MahApps/MahApps.Metro.IconPacks"); - SignNuGet(MakeAbsolute(PACKAGE_DIR).ToString()); }); @@ -341,10 +331,9 @@ Task("Default") .IsDependentOn("Restore") // .IsDependentOn("StyleXaml") .IsDependentOn("Build") - .IsDependentOn("Zip") ; -Task("appveyor") +Task("ci") .IsDependentOn("Default") .IsDependentOn("Sign") ; diff --git a/build/Install-WindowsSDK.ps1 b/build/Install-WindowsSDK.ps1 index 9c0e8e26..a40ae71d 100644 --- a/build/Install-WindowsSDK.ps1 +++ b/build/Install-WindowsSDK.ps1 @@ -1,7 +1,7 @@ mkdir c:\winsdktemp $client = new-object System.Net.WebClient -$client.DownloadFile("https://go.microsoft.com/fwlink/p/?linkid=864422", "c:\winsdktemp\winsdksetup.exe") +$client.DownloadFile("https://go.microsoft.com/fwlink/?linkid=2083338", "c:\winsdktemp\winsdksetup.exe") Start-Process "c:\winsdktemp\winsdksetup.exe" "/features OptionId.SigningTools OptionId.UWPManaged OptionId.UWPLocalized /quiet" -NoNewWindow -Wait diff --git a/src/Directory.build.props b/src/Directory.build.props index 907e227a..d8e0995e 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -6,7 +6,7 @@ - net462;net47;netcoreapp3.1;net5.0-windows;uap10.0.16299 + net462;net47;netcoreapp3.1;net5.0-windows;uap10.0.18362 true true true @@ -24,8 +24,8 @@ - 16299 - 16299 + 18362 + 18362 true true full diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.BootstrapIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.BootstrapIcons.csproj index d2a224f7..a6c5e129 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.BootstrapIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.BootstrapIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.BoxIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.BoxIcons.csproj index 349210e0..a0932b84 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.BoxIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.BoxIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Codicons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Codicons.csproj index 93ca5129..e22d25c7 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Codicons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Codicons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Coolicons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Coolicons.csproj index 85386f4c..024961cb 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Coolicons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Coolicons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Entypo.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Entypo.csproj index 716c3fcf..e58bbee9 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Entypo.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Entypo.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.EvaIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.EvaIcons.csproj index b25180a0..932586dd 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.EvaIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.EvaIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FeatherIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FeatherIcons.csproj index 00e73c07..502d9842 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FeatherIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FeatherIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FileIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FileIcons.csproj index 9dd511fc..d61d9b3c 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FileIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FileIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FontAwesome.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FontAwesome.csproj index f850dc33..a04ff2f9 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FontAwesome.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.FontAwesome.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Fontaudio.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Fontaudio.csproj index 46611534..fc104b89 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Fontaudio.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Fontaudio.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Fontisto.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Fontisto.csproj index e58876b7..a9644edf 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Fontisto.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Fontisto.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.ForkAwesome.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.ForkAwesome.csproj index 03b8ff93..b2e3f4c9 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.ForkAwesome.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.ForkAwesome.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Ionicons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Ionicons.csproj index 7a55e581..3e3c78dd 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Ionicons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Ionicons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.JamIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.JamIcons.csproj index 342e13be..4fbf51b5 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.JamIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.JamIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Material.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Material.csproj index d1a031b0..04d584e1 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Material.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Material.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialDesign.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialDesign.csproj index 18950dde..56155caf 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialDesign.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialDesign.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialLight.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialLight.csproj index c01fab4e..ac780bbd 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialLight.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.MaterialLight.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Microns.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Microns.csproj index 3cf40b69..fdafe402 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Microns.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Microns.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Modern.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Modern.csproj index 4b00191a..cdeb2bf6 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Modern.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Modern.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Octicons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Octicons.csproj index a89c9afe..47f6ac3e 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Octicons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Octicons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.PicolIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.PicolIcons.csproj index d84b37b7..0c9745fc 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.PicolIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.PicolIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.PixelartIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.PixelartIcons.csproj index 7f976340..0a9a7755 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.PixelartIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.PixelartIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RPGAwesome.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RPGAwesome.csproj index d2cc226e..326920da 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RPGAwesome.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RPGAwesome.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RadixIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RadixIcons.csproj index b224bbb7..2ffb97b5 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RadixIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RadixIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RemixIcon.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RemixIcon.csproj index 14179128..36fccda6 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RemixIcon.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.RemixIcon.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.SimpleIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.SimpleIcons.csproj index c002bb92..ed27a650 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.SimpleIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.SimpleIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Typicons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Typicons.csproj index 69dde96d..d8cedff3 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Typicons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Typicons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Unicons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Unicons.csproj index 2e941cc4..4488b139 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Unicons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Unicons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.VaadinIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.VaadinIcons.csproj index 786d3c16..ffa2e230 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.VaadinIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.VaadinIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.WeatherIcons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.WeatherIcons.csproj index 4a168825..2bcfcd9b 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.WeatherIcons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.WeatherIcons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Zondicons.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Zondicons.csproj index 34001e37..64ccd32c 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Zondicons.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.Zondicons.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.csproj b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.csproj index 27f26598..664a913a 100644 --- a/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.csproj +++ b/src/MahApps.Metro.IconPacks/MahApps.Metro.IconPacks.csproj @@ -54,14 +54,14 @@ - + - +