Skip to content
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

Update windows sdk dependency to uap10.0.18362 #315

Merged
merged 4 commits into from Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 39 additions & 0 deletions .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 }}
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -11,7 +11,7 @@
Awesome icon packs for <code>WPF</code> and <code>UWP</code> in one library
</p>
<p>
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)
</p>
<a href="https://gitter.im/MahApps/MahApps.Metro.IconPacks">
<img src="https://img.shields.io/badge/Gitter-Join%20Chat-green.svg?style=flat-square">
Expand Down
18 changes: 9 additions & 9 deletions appveyor.yml
Expand Up @@ -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\*.*
Expand All @@ -45,4 +45,4 @@ nuget:

skip_commits:
files:
- '**/*.md'
- "**/*.md"
13 changes: 1 addition & 12 deletions build.cake
Expand Up @@ -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());
});

Expand Down Expand Up @@ -341,10 +331,9 @@ Task("Default")
.IsDependentOn("Restore")
// .IsDependentOn("StyleXaml")
.IsDependentOn("Build")
.IsDependentOn("Zip")
;

Task("appveyor")
Task("ci")
.IsDependentOn("Default")
.IsDependentOn("Sign")
;
Expand Down
2 changes: 1 addition & 1 deletion 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

Expand Down
6 changes: 3 additions & 3 deletions src/Directory.build.props
Expand Up @@ -6,7 +6,7 @@

<!-- Project properties -->
<PropertyGroup>
<TargetFrameworks>net462;net47;netcoreapp3.1;net5.0-windows;uap10.0.16299</TargetFrameworks>
<TargetFrameworks>net462;net47;netcoreapp3.1;net5.0-windows;uap10.0.18362</TargetFrameworks>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AutoGenerateBindingRedirects Condition=" $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('uap')) ">true</AutoGenerateBindingRedirects>
Expand All @@ -24,8 +24,8 @@

<!-- UAP -->
<PropertyGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
<DefaultTargetPlatformVersion>16299</DefaultTargetPlatformVersion>
<DefaultTargetPlatformMinVersion>16299</DefaultTargetPlatformMinVersion>
<DefaultTargetPlatformVersion>18362</DefaultTargetPlatformVersion>
<DefaultTargetPlatformMinVersion>18362</DefaultTargetPlatformMinVersion>
<UseWindowsDesktopSdk>true</UseWindowsDesktopSdk>
<EnableDefaultXamlItems>true</EnableDefaultXamlItems>
<DebugType>full</DebugType>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down
Expand Up @@ -23,8 +23,8 @@
<Compile Remove="*.cs;Icons\**\*.cs" />
<Compile Remove="Themes\UAP\**\*.*;Themes\WPF\**\*.*" />
<EmbeddedResource Include="**\$(AssemblyName).rd.xml" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.16299' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.16299' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' != 'uap10.0.18362' " Exclude="**\*Extension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Compile Condition=" '$(TargetFramework)' == 'uap10.0.18362' " Exclude="**\*ImageExtension*.cs;**\*ImageConverter*.cs" Include="**\$(IconsName)\*.cs" />
<Page Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" Generator="MSBuild:Compile" Include="Themes\UAP\$(IconsName)\*.xaml;Themes\UAP\PackIcon$(IconsName).xaml" Link="Themes\%(RecursiveDir)%(Filename)%(Extension)" SubType="Designer" />
<Compile DependentUpon="%(Filename)" Update="**\*.xaml.cs" />
</ItemGroup>
Expand Down