Skip to content

Updated TFM of Notifications package from netcoreapp3.0 to netcoreapp3.1. #3383

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.

Sign up for GitHub

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

Merged
azchohfi merged 3 commits into from
Jul 22, 2020
Merged

Updated TFM of Notifications package from netcoreapp3.0 to netcoreapp3.1. #3383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3055a46
Updated TFM of Notifications package from netcoreapp3.0 to netcoreapp…
azchohfi Jul 8, 2020
868c825
Merge branch 'master' into nonEOLNetCore
azchohfi Jul 10, 2020
3b20838
Merge branch 'master' into nonEOLNetCore
azchohfi Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
<DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
Copy link
Member

@Sergio0694 Sergio0694 Jul 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woah, hadn't noticed the toolkit was still supporting .NET Framework 4.6.2 too! 😄

<UseWpf>true</UseWpf>
<EnableDefaultPageItems>false</EnableDefaultPageItems>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
<ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
Expand All @@ -40,28 +45,9 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net462'">
<Reference Include="System.Data" />
<Reference Include="System.ComponentModel" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Web" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
<PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
<Page Update="PlatformSpecific\NetFramework\PopupWPF.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Update="PlatformSpecific\NetFramework\PopupWPF.xaml.cs">
<DependentUpon>PlatformSpecific\NetFramework\PopupWPF.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>

<ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.16299')">
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras">

<PropertyGroup>
<TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.1</TargetFrameworks>
<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
<Title>Windows Community Toolkit Notifications</Title>
<Description>
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/UnitTests.UWP/Helpers/Test_StorageFileHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace UnitTests.Helpers
public class Test_StorageFileHelper
{
private const string Sampletext = "Lorem ipsum dolor sit amet";
private const string Filename = "filename.txt";
private const string Filename = "Test_StorageFileHelper_file.txt";
private const string PackagedFilePath = @"Assets\Samples\lorem.txt";

[TestCategory("Helpers")]
Expand Down
2 changes: 1 addition & 1 deletion UnitTests/UnitTests.UWP/Helpers/Test_StreamHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace UnitTests.Helpers
public class Test_StreamHelper
{
private const string SampleText = "Lorem ipsum dolor sit amet";
private const string Filename = "filename.txt";
private const string Filename = "Test_StreamHelper_file.txt";
private const string PackagedFilePath = @"Assets\Samples\lorem.txt";

[TestCategory("Helpers")]
Expand Down
11 changes: 2 additions & 9 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,9 @@ steps:
displayName: Setup Environment Variables

- task: NuGetToolInstaller@0
displayName: Use NuGet 5.0.0
displayName: Use NuGet 5.6.0
inputs:
versionSpec: 5.0.0

- task: UseDotNet@2
inputs:
packageType: 'sdk'
version: '3.1.200'
performMultiLevelLookup: true
displayName: Use .NET Core sdk 3
versionSpec: 5.6.0

- task: DotNetCoreCLI@2
inputs:
Expand Down