Skip to content

Commit 32f2b4c

Browse files
azchohfiazchohfi
committed
Updated Target and Min version for 7.x release.
1 parent 9c95639 commit 32f2b4c

File tree

23 files changed

+42
-37
lines changed

23 files changed

+42
-37
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
1515
<IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
1616
<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
17-
<DefaultTargetPlatformVersion>17763</DefaultTargetPlatformVersion>
18-
<DefaultTargetPlatformMinVersion>16299</DefaultTargetPlatformMinVersion>
17+
<DefaultTargetPlatformVersion>18362</DefaultTargetPlatformVersion>
18+
<DefaultTargetPlatformMinVersion>17134</DefaultTargetPlatformMinVersion>
1919
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
2020
</PropertyGroup>
2121

‎Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<Choose>
3-
<When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.16299' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">
3+
<When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17134' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">
44
<!-- UAP versions for uap10.0 where TPMV isn't implied -->
55
<PropertyGroup>
66
<TargetPlatformVersion>10.0.$(DefaultTargetPlatformVersion).0</TargetPlatformVersion>

‎GazeInputTest/GazeInputTest.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>GazeInputTest</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -86,7 +86,7 @@
8686
<UseVSHostingProcess>false</UseVSHostingProcess>
8787
<ErrorReport>prompt</ErrorReport>
8888
<Prefer32Bit>true</Prefer32Bit>
89-
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
89+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
9292
<DebugSymbols>true</DebugSymbols>

‎Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFrameworks>uap10.0.16299;netstandard2.0;NET462</TargetFrameworks>
4+
<TargetFrameworks>uap10.0.17134;netstandard2.0;NET462</TargetFrameworks>
55
<Title>Windows Community Toolkit .NET Standard Services</Title>
66
<Description>
77
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.
@@ -16,7 +16,7 @@
1616
<NoWarn>CS8002;CS0618</NoWarn>
1717
</PropertyGroup>
1818

19-
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">
19+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.17134'">
2020
<DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
2121
</PropertyGroup>
2222

@@ -30,7 +30,7 @@
3030
<PackageReference Include="System.Net.Http" Version="4.3.3" />
3131
</ItemGroup>
3232

33-
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.16299'">
33+
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.17134'">
3434
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
3535
</ItemGroup>
3636

@@ -65,7 +65,7 @@
6565
</Compile>
6666
</ItemGroup>
6767

68-
<ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.16299')">
68+
<ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.17134')">
6969
<Compile Remove="PlatformSpecific\Uwp\**\*" />
7070
</ItemGroup>
7171
</Project>

‎Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFramework>uap10.0.16299</TargetFramework>
4+
<TargetFramework>uap10.0.17134</TargetFramework>
55
<Title>Windows Community Toolkit Devices</Title>
66
<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>
77
<PackageTags>UWP Toolkit Windows Devices Bluetooth BluetoothLE BLE Networking</PackageTags>

‎Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
4-
<TargetFramework>uap10.0.16299</TargetFramework>
4+
<TargetFramework>uap10.0.17134</TargetFramework>
55
<Title>Windows Community Toolkit Developer Tools</Title>
66
<Description>This library provides XAML user controls and services to help developers build their app. It is part of the Windows Community Toolkit.
77

‎Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.UWP.Input.GazeInteraction.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
4343
<AppContainerApplication>true</AppContainerApplication>
4444
<ApplicationType>Windows Store</ApplicationType>
45-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
45+
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
4646
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
4747
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
4848
<ProjectName>Microsoft.Toolkit.Uwp.Input.GazeInteraction</ProjectName>

‎Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<NugetTargetMoniker Condition="'$(DesignTimeBuild)' == 'true'">native</NugetTargetMoniker>
4949
<NugetTargetMoniker Condition="'$(DesignTimeBuild)' != 'true'">UAP,Version=v10.0</NugetTargetMoniker>
5050
<PackageTargetFallback>uap10.0</PackageTargetFallback>
51-
<TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
51+
<TargetPlatformVersion Condition="'$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
5252
<TargetPlatformMinVersion Condition="'$(TargetPlatformMinVersion)' == '' ">10.0.10240.0</TargetPlatformMinVersion>
5353
<DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);NETFX_CORE;WINDOWS_UWP;WINRT</DefineConstants>
5454
<CopyLocalLockFileAssemblies Condition="'$(CopyLocalLockFileAssemblies)' == ''">false</CopyLocalLockFileAssemblies>

‎Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,11 @@ private async void GitHub_OnClick(object sender, RoutedEventArgs e)
501501

502502
private void UpdateXamlRender(string text)
503503
{
504+
if (XamlCodeEditor == null)
505+
{
506+
return;
507+
}
508+
504509
// Hide any Previous Errors
505510
XamlCodeEditor.ClearErrors();
506511

‎Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AssemblyName>Microsoft.Toolkit.Uwp.Samples.BackgroundTasks</AssemblyName>
1212
<DefaultLanguage>fr-FR</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

0 commit comments

Comments
 (0)