unoplatform
/
Uno.WindowsCommunityToolkit
зеркало из https://github.com/unoplatform/Uno.WindowsCommunityToolkit.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updated from netcoreapp5.0 to net5.0.

This commit is contained in:
Alexandre Zollinger Chohfi 2020-05-01 15:20:27 -07:00
Родитель d0861dc463
Коммит e24ff72edd
23 изменённых файлов: 65 добавлений и 64 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Directory.Build.props
Просмотреть файл

@ -104,7 +104,7 @@
<ItemGroup Condition="'$(IsUwpProject)' == 'true' or '$(IsDesignProject)' == 'true' or '$(IsSampleProject)' == 'true' or '$(IsTestProject)' == 'true'"> <ItemGroup Condition="'$(IsUwpProject)' == 'true' or '$(IsDesignProject)' == 'true' or '$(IsSampleProject)' == 'true' or '$(IsTestProject)' == 'true'">
<PackageReference Include="Microsoft.WinUI"> <PackageReference Include="Microsoft.WinUI">
<Version>3.0.0-preview1.200430.3-CI</Version> <Version>3.0.0-preview1.200501.0-nightly</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

10
Directory.Build.targets
Просмотреть файл

@ -1,17 +1,13 @@
<Project> <Project>
<Choose> <Choose>
<When Condition="'$(ShouldAddWinUI)' == 'true' and $(TargetFramework) == 'netcoreapp5.0'"> <When Condition="'$(ShouldAddWinUI)' == 'true' and $(TargetFramework) == 'net5.0'">
<PropertyGroup Condition="'$(ShouldAddWinUI)' == 'true' and $(TargetFramework) == 'netcoreapp5.0'"> <PropertyGroup Condition="'$(ShouldAddWinUI)' == 'true' and $(TargetFramework) == 'net5.0'">
<AssetTargetFallback>uap10.0.$(DefaultTargetPlatformMinVersion)</AssetTargetFallback> <AssetTargetFallback>uap10.0.$(DefaultTargetPlatformMinVersion)</AssetTargetFallback>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.0.200429.4" /> <PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.0.200501.4" />
<!--<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />--> <!--<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />-->
</ItemGroup> </ItemGroup>
<PropertyGroup Condition="'$(ShouldAddWinUI)' == 'true' and $(TargetFramework) == 'netcoreapp5.0'">
<AssetTargetFallback>uap10.0.$(DefaultTargetPlatformMinVersion)</AssetTargetFallback>
</PropertyGroup>
</When> </When>
</Choose> </Choose>

8
Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp5.0;netstandard2.0</TargetFrameworks> <!-- Removed NET462/WPF --> <TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks> <!-- Removed NET462/WPF -->
<Title>Windows Community Toolkit .NET Standard Services</Title> <Title>Windows Community Toolkit .NET Standard Services</Title>
<Description> <Description>
This .NET standard library enables access to different data sources such as Microsoft Graph, OneDrive, Twitter, Microsoft Translator, and LinkedIn. It is part of the Windows Community Toolkit. This .NET standard library enables access to different data sources such as Microsoft Graph, OneDrive, Twitter, Microsoft Translator, and LinkedIn. It is part of the Windows Community Toolkit.
@ -14,7 +14,7 @@
<NoWarn>CS8002;CS0618</NoWarn> <NoWarn>CS8002;CS0618</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp5.0'"> <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">
<DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants> <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
</PropertyGroup> </PropertyGroup>
@ -28,7 +28,7 @@
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp5.0'"> <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" /> <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
</ItemGroup> </ItemGroup>
@ -63,7 +63,7 @@
</Compile>--> </Compile>-->
</ItemGroup> </ItemGroup>
<ItemGroup Condition="!('$(TargetFramework)'=='netcoreapp5.0')"> <ItemGroup Condition="!('$(TargetFramework)'=='net5.0')">
<Compile Remove="PlatformSpecific\Uwp\**\*" /> <Compile Remove="PlatformSpecific\Uwp\**\*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit Devices</Title> <Title>Windows Community Toolkit Devices</Title>
<Description>This library enables easier consumption of connectivity Devices/Peripherals and handle its connection to Windows devices. It contains BluetoothLE and Network connectivity helpers.</Description> <Description>This library enables easier consumption of connectivity Devices/Peripherals and handle its connection to Windows devices. It contains BluetoothLE and Network connectivity helpers.</Description>
<PackageTags>UWP Toolkit Windows Devices Bluetooth BluetoothLE BLE Networking</PackageTags> <PackageTags>UWP Toolkit Windows Devices Bluetooth BluetoothLE BLE Networking</PackageTags>

2
Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit Developer Tools</Title> <Title>Windows Community Toolkit Developer Tools</Title>
<Description>This library provides XAML user controls and services to help developers build their app. It is part of the Windows Community Toolkit. <Description>This library provides XAML user controls and services to help developers build their app. It is part of the Windows Community Toolkit.

8
Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.WinUI.3.0.0-preview1.200430.3-CI\build\native\Microsoft.WinUI.props" Condition="Exists('..\packages\Microsoft.WinUI.3.0.0-preview1.200430.3-CI\build\native\Microsoft.WinUI.props')" /> <Import Project="..\packages\Microsoft.WinUI.3.0.0-preview1.200501.0-nightly\build\native\Microsoft.WinUI.props" Condition="Exists('..\packages\Microsoft.WinUI.3.0.0-preview1.200501.0-nightly\build\native\Microsoft.WinUI.props')" />
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" /> <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" />
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM"> <ProjectConfiguration Include="Debug|ARM">
@ -408,7 +408,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" /> <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\packages\Microsoft.WinUI.3.0.0-preview1.200430.3-CI\build\native\Microsoft.WinUI.targets" Condition="Exists('..\packages\Microsoft.WinUI.3.0.0-preview1.200430.3-CI\build\native\Microsoft.WinUI.targets')" /> <Import Project="..\packages\Microsoft.WinUI.3.0.0-preview1.200501.0-nightly\build\native\Microsoft.WinUI.targets" Condition="Exists('..\packages\Microsoft.WinUI.3.0.0-preview1.200501.0-nightly\build\native\Microsoft.WinUI.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
@ -416,7 +416,7 @@
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props'))" /> <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets'))" /> <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.WinUI.3.0.0-preview1.200430.3-CI\build\native\Microsoft.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WinUI.3.0.0-preview1.200430.3-CI\build\native\Microsoft.WinUI.props'))" /> <Error Condition="!Exists('..\packages\Microsoft.WinUI.3.0.0-preview1.200501.0-nightly\build\native\Microsoft.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WinUI.3.0.0-preview1.200501.0-nightly\build\native\Microsoft.WinUI.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.WinUI.3.0.0-preview1.200430.3-CI\build\native\Microsoft.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WinUI.3.0.0-preview1.200430.3-CI\build\native\Microsoft.WinUI.targets'))" /> <Error Condition="!Exists('..\packages\Microsoft.WinUI.3.0.0-preview1.200501.0-nightly\build\native\Microsoft.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WinUI.3.0.0-preview1.200501.0-nightly\build\native\Microsoft.WinUI.targets'))" />
</Target> </Target>
</Project> </Project>

2
Microsoft.Toolkit.Uwp.Input.GazeInteraction/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Microsoft.Windows.CppWinRT" version="2.0.200316.3" targetFramework="native" /> <package id="Microsoft.Windows.CppWinRT" version="2.0.200316.3" targetFramework="native" />
<package id="Microsoft.WinUI" version="3.0.0-preview1.200430.3-CI" targetFramework="native" /> <package id="Microsoft.WinUI" version="3.0.0-preview1.200501.0-nightly" targetFramework="native" />
</packages> </packages>

2
Microsoft.Toolkit.Uwp.Notifications.JavaScript/Microsoft.Toolkit.Uwp.Notifications.JavaScript.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<IncludeBuildOutput>false</IncludeBuildOutput> <IncludeBuildOutput>false</IncludeBuildOutput>
<Title>Windows Community Toolkit Notifications for JavaScript</Title> <Title>Windows Community Toolkit Notifications for JavaScript</Title>
<Description> <Description>

2
Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp5.0;net461</TargetFrameworks> <!-- TODO WinUI3 add netstandard1.4 and native back--> <TargetFrameworks>net5.0;net461</TargetFrameworks> <!-- TODO WinUI3 add netstandard1.4 and native back-->
<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants> <DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
<Title>Windows Community Toolkit Notifications</Title> <Title>Windows Community Toolkit Notifications</Title>
<Description> <Description>

2
Microsoft.Toolkit.Uwp.Services/Microsoft.Toolkit.Uwp.Services.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit Services</Title> <Title>Windows Community Toolkit Services</Title>
<Description>This library enables access to Facebook. It is part of the Windows Community Toolkit.</Description> <Description>This library enables access to Facebook. It is part of the Windows Community Toolkit.</Description>
<PackageTags>UWP Toolkit Windows OAuth Facebook</PackageTags> <PackageTags>UWP Toolkit Windows OAuth Facebook</PackageTags>

2
Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit Animations</Title> <Title>Windows Community Toolkit Animations</Title>
<Description> <Description>
This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit. This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit.

8
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj
Просмотреть файл

@ -12,20 +12,20 @@
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<AssetTargetFallback>$(AssetTargetFallback);netcoreapp5.0</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);net5.0</AssetTargetFallback>
<!-- Workaround for WinUI3 bug --> <!-- Workaround for WinUI3 bug -->
<MsAppxPackageTargets>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\EmptyMsAppxPackage.Targets'))</MsAppxPackageTargets> <MsAppxPackageTargets>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\EmptyMsAppxPackage.Targets'))</MsAppxPackageTargets>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\netcoreapp5.0\Design\</OutputPath> <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\net5.0\Design\</OutputPath>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\netcoreapp5.0\Design\</OutputPath> <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\net5.0\Design\</OutputPath>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -112,7 +112,7 @@
<AppDesigner Include="Properties\" /> <AppDesigner Include="Properties\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\$(Configuration)\netcoreapp5.0\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml"> <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\$(Configuration)\net5.0\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml">
<Link>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml</Link> <Link>Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml</Link>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>

2
Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit Controls DataGrid</Title> <Title>Windows Community Toolkit Controls DataGrid</Title>
<Description> <Description>
This library provides a XAML DataGrid control. It is part of the Windows Community Toolkit. This library provides a XAML DataGrid control. It is part of the Windows Community Toolkit.

8
Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj
Просмотреть файл

@ -13,20 +13,20 @@
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NoWarn>$(NoWarn);0618</NoWarn> <NoWarn>$(NoWarn);0618</NoWarn>
<AssetTargetFallback>$(AssetTargetFallback);netcoreapp5.0</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);net5.0</AssetTargetFallback>
<!-- Workaround for WinUI3 bug --> <!-- Workaround for WinUI3 bug -->
<MsAppxPackageTargets>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\EmptyMsAppxPackage.Targets'))</MsAppxPackageTargets> <MsAppxPackageTargets>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\EmptyMsAppxPackage.Targets'))</MsAppxPackageTargets>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\netcoreapp5.0\Design\</OutputPath> <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\net5.0\Design\</OutputPath>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\netcoreapp5.0\Design\</OutputPath> <OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\net5.0\Design\</OutputPath>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<Optimize>true</Optimize> <Optimize>true</Optimize>
@ -139,7 +139,7 @@
<AppDesigner Include="Properties\" /> <AppDesigner Include="Properties\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls\bin\$(Configuration)\netcoreapp5.0\Microsoft.Toolkit.Uwp.UI.Controls.xml"> <EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls\bin\$(Configuration)\net5.0\Microsoft.Toolkit.Uwp.UI.Controls.xml">
<Link>Microsoft.Toolkit.Uwp.UI.Controls.xml</Link> <Link>Microsoft.Toolkit.Uwp.UI.Controls.xml</Link>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>

2
Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit Controls</Title> <Title>Windows Community Toolkit Controls</Title>
<Description> <Description>
This library provides XAML templated controls. It is part of the Windows Community Toolkit. This library provides XAML templated controls. It is part of the Windows Community Toolkit.

2
Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit UI Media</Title> <Title>Windows Community Toolkit UI Media</Title>
<Description> <Description>
This library provides UI brushes. It is part of the Windows Community Toolkit. This library provides UI brushes. It is part of the Windows Community Toolkit.

4
Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit UI</Title> <Title>Windows Community Toolkit UI</Title>
<Description> <Description>
This library provides UI components, such as XAML extensions, helpers, converters and more. It is part of the Windows Community Toolkit. This library provides UI components, such as XAML extensions, helpers, converters and more. It is part of the Windows Community Toolkit.
@ -53,5 +53,5 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" /> <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Title>Windows Community Toolkit</Title> <Title>Windows Community Toolkit</Title>
<Description>This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc.</Description> <Description>This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc.</Description>
<PackageTags>UWP Toolkit Windows</PackageTags> <PackageTags>UWP Toolkit Windows</PackageTags>

2
UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>

2
UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj
Просмотреть файл

@ -16,7 +16,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.0.1" /> <PackageReference Include="Microsoft.Toolkit.Forms.UI.XamlHost" Version="6.0.1" />
<PackageReference Include="Microsoft.WinUI"> <PackageReference Include="Microsoft.WinUI">
<Version>3.0.0-preview1.200430.3-CI</Version> <Version>3.0.0-preview1.200501.0-nightly</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

2
UnitTests/UnitTests/UnitTests.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion> <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Platforms>x86;x64</Platforms> <Platforms>x86;x64</Platforms>

22
Windows Community Toolkit.sln
Просмотреть файл

@ -126,12 +126,8 @@ Global
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Build.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Build.0 = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Deploy.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Deploy.0 = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Build.0 = Debug|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM64.ActiveCfg = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Deploy.0 = Debug|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM64.ActiveCfg = Debug|ARM64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM64.Build.0 = Debug|ARM64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM64.Deploy.0 = Debug|ARM64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.ActiveCfg = Debug|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.ActiveCfg = Debug|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.Build.0 = Debug|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.Build.0 = Debug|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.Deploy.0 = Debug|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x64.Deploy.0 = Debug|x64
@ -139,17 +135,15 @@ Global
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Build.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Build.0 = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Deploy.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|x86.Deploy.0 = Debug|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|Any CPU.ActiveCfg = Release|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|Any CPU.ActiveCfg = Release|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM.ActiveCfg = Release|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM.ActiveCfg = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM64.ActiveCfg = Release|ARM64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM.Build.0 = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM64.ActiveCfg = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|ARM64.Build.0 = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x64.ActiveCfg = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x64.ActiveCfg = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x86.ActiveCfg = Release|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Native|x86.ActiveCfg = Release|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|Any CPU.ActiveCfg = Release|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.ActiveCfg = Release|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Build.0 = Release|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM64.ActiveCfg = Release|x86
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM.Deploy.0 = Release|ARM
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM64.ActiveCfg = Release|ARM64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM64.Build.0 = Release|ARM64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|ARM64.Deploy.0 = Release|ARM64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.ActiveCfg = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.ActiveCfg = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.Build.0 = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.Build.0 = Release|x64
{719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.Deploy.0 = Release|x64 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Release|x64.Deploy.0 = Release|x64

31
build/build.cake
Просмотреть файл

@ -102,6 +102,19 @@ void RetrieveVersion()
Information("\nBuild Version: " + Version); Information("\nBuild Version: " + Version);
} }
void UpdateToolsPath(MSBuildSettings buildSettings)
{
// Workaround for https://github.com/cake-build/cake/issues/2128
var vsInstallation = VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = true });
if (vsInstallation != null)
{
buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\Current\Bin\MSBuild.exe");
if (!FileExists(buildSettings.ToolPath))
buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\15.0\Bin\MSBuild.exe");
}
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// DEFAULT TASK // DEFAULT TASK
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
@ -161,15 +174,7 @@ Task("BuildProjects")
.SetConfiguration("Release") .SetConfiguration("Release")
.WithTarget("Restore"); .WithTarget("Restore");
// Workaround for https://github.com/cake-build/cake/issues/2128 UpdateToolsPath(buildSettings);
var vsInstallation = VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = true });
if (vsInstallation != null)
{
buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\Current\Bin\MSBuild.exe");
if (!FileExists(buildSettings.ToolPath))
buildSettings.ToolPath = vsInstallation.CombineWithFilePath(@"MSBuild\15.0\Bin\MSBuild.exe");
}
MSBuild(Solution, buildSettings); MSBuild(Solution, buildSettings);
@ -184,6 +189,8 @@ Task("BuildProjects")
.WithTarget("Build") .WithTarget("Build")
.WithProperty("GenerateLibraryLayout", "true"); .WithProperty("GenerateLibraryLayout", "true");
UpdateToolsPath(buildSettings);
MSBuild(Solution, buildSettings); MSBuild(Solution, buildSettings);
}); });
@ -234,6 +241,8 @@ Task("Package")
.WithProperty("GenerateLibraryLayout", "true") .WithProperty("GenerateLibraryLayout", "true")
.WithProperty("PackageOutputPath", nupkgDir); .WithProperty("PackageOutputPath", nupkgDir);
UpdateToolsPath(buildSettings);
MSBuild(Solution, buildSettings); MSBuild(Solution, buildSettings);
// Build and pack C++ packages // Build and pack C++ packages
@ -243,6 +252,8 @@ Task("Package")
} }
.SetConfiguration("Native"); .SetConfiguration("Native");
UpdateToolsPath(buildSettings);
// Ignored for now since WinUI3 alpha does not support ARM // Ignored for now since WinUI3 alpha does not support ARM
// buildSettings.SetPlatformTarget(PlatformTarget.ARM); // buildSettings.SetPlatformTarget(PlatformTarget.ARM);
// MSBuild(Solution, buildSettings); // MSBuild(Solution, buildSettings);
@ -291,7 +302,7 @@ Task("Test")
{ {
var vswhere = VSWhereLatest(new VSWhereLatestSettings var vswhere = VSWhereLatest(new VSWhereLatestSettings
{ {
IncludePrerelease = false IncludePrerelease = true
}); });
var testSettings = new VSTestSettings var testSettings = new VSTestSettings