From 3f7b9a706c6dfd092f4b2f1acc6bddb4c55ac9ff Mon Sep 17 00:00:00 2001 From: James Croft Date: Wed, 10 Nov 2021 21:18:04 +0000 Subject: [PATCH 1/2] Updated package references --- Directory.Build.props | 4 ++-- .../MADE.Samples.UWP/MADE.Samples.UWP.csproj | 2 +- .../MADE.Samples.Wasm/MADE.Samples.Wasm.csproj | 2 +- src/MADE.Data.EFCore/IEntityBase.cs | 7 +++---- src/MADE.Data.EFCore/MADE.Data.EFCore.csproj | 10 +++++++--- src/MADE.UI.Controls.FilePicker/FilePickerItem.cs | 13 +++++-------- src/MADE.Web.Mvc/MADE.Web.Mvc.csproj | 4 ++-- src/MADE.Web/MADE.Web.csproj | 12 +++++------- .../MADE.Collections.Tests.csproj | 4 ++-- .../MADE.Data.Converters.Tests.csproj | 4 ++-- .../MADE.Data.Validation.Tests.csproj | 4 ++-- .../MADE.Diagnostics.Tests.csproj | 4 ++-- .../MADE.Networking.Tests.csproj | 4 ++-- tests/MADE.Web.Tests/MADE.Web.Tests.csproj | 4 ++-- 14 files changed, 38 insertions(+), 40 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index f18c082b..133075ef 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,7 @@ https://github.com/MADE-Apps/MADE.NET/releases en true - 8.0 + latest @@ -25,7 +25,7 @@ - + diff --git a/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj b/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj index 5db1b011..c07e97bf 100644 --- a/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj +++ b/samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj @@ -3,7 +3,7 @@ - 2.0.11 + 2.0.12 7.0.3 diff --git a/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj b/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj index 49fd4690..58b1a2f6 100644 --- a/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj +++ b/samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj @@ -2,7 +2,7 @@ Exe - netstandard2.0 + net5.0 NU1701 diff --git a/src/MADE.Data.EFCore/IEntityBase.cs b/src/MADE.Data.EFCore/IEntityBase.cs index 98646137..a230477e 100644 --- a/src/MADE.Data.EFCore/IEntityBase.cs +++ b/src/MADE.Data.EFCore/IEntityBase.cs @@ -1,4 +1,4 @@ -namespace MADE.Data.EFCore +namespace MADE.Data.EFCore { using System; @@ -15,12 +15,11 @@ public interface IEntityBase /// /// Gets or sets the date of the entity's creation. /// - DateTime CreatedDate { get; set; } + DateTime CreatedDate { get; set; } /// /// Gets or sets the date of the entity's last update. /// - DateTime? UpdatedDate { get; set; } - + DateTime? UpdatedDate { get; set; } } } \ No newline at end of file diff --git a/src/MADE.Data.EFCore/MADE.Data.EFCore.csproj b/src/MADE.Data.EFCore/MADE.Data.EFCore.csproj index adf4c550..ac14cd93 100644 --- a/src/MADE.Data.EFCore/MADE.Data.EFCore.csproj +++ b/src/MADE.Data.EFCore/MADE.Data.EFCore.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;net5.0;netcoreapp3.1 true MADE.NET Entity Framework @@ -14,12 +14,16 @@ + + + + - + - + diff --git a/src/MADE.UI.Controls.FilePicker/FilePickerItem.cs b/src/MADE.UI.Controls.FilePicker/FilePickerItem.cs index c4a9a3a4..1ad513d0 100644 --- a/src/MADE.UI.Controls.FilePicker/FilePickerItem.cs +++ b/src/MADE.UI.Controls.FilePicker/FilePickerItem.cs @@ -6,7 +6,6 @@ namespace MADE.UI.Controls using System; using System.Threading.Tasks; using Windows.Storage; - using Windows.Storage.FileProperties; using Windows.UI.Xaml.Media.Imaging; /// @@ -53,15 +52,10 @@ public override string ToString() internal async Task LoadThumbnailAsync() { +#if WINDOWS_UWP if (this.File != null) { - StorageItemThumbnail thumbnail; - -#if WINDOWS_UWP - thumbnail = await this.File.GetThumbnailAsync(Windows.Storage.FileProperties.ThumbnailMode.SingleItem, 256, ThumbnailOptions.ResizeThumbnail); -#else - thumbnail = null; -#endif + var thumbnail = await this.File.GetThumbnailAsync(Windows.Storage.FileProperties.ThumbnailMode.SingleItem, 256, Windows.Storage.FileProperties.ThumbnailOptions.ResizeThumbnail); if (thumbnail == null) { @@ -71,6 +65,9 @@ internal async Task LoadThumbnailAsync() this.Thumbnail = new BitmapImage(); this.Thumbnail.SetSource(thumbnail.CloneStream()); } +#else + await Task.CompletedTask; +#endif } } } \ No newline at end of file diff --git a/src/MADE.Web.Mvc/MADE.Web.Mvc.csproj b/src/MADE.Web.Mvc/MADE.Web.Mvc.csproj index e689eb98..ade129b9 100644 --- a/src/MADE.Web.Mvc/MADE.Web.Mvc.csproj +++ b/src/MADE.Web.Mvc/MADE.Web.Mvc.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net5.0;net6.0 true MADE.NET Web MVC @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/src/MADE.Web/MADE.Web.csproj b/src/MADE.Web/MADE.Web.csproj index eb09d3aa..2aa7da51 100644 --- a/src/MADE.Web/MADE.Web.csproj +++ b/src/MADE.Web/MADE.Web.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net5.0;net6.0 true MADE.NET Web @@ -15,12 +15,10 @@ - - - - - - + + + + diff --git a/tests/MADE.Collections.Tests/MADE.Collections.Tests.csproj b/tests/MADE.Collections.Tests/MADE.Collections.Tests.csproj index 60e924df..cc0c9434 100644 --- a/tests/MADE.Collections.Tests/MADE.Collections.Tests.csproj +++ b/tests/MADE.Collections.Tests/MADE.Collections.Tests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/tests/MADE.Data.Converters.Tests/MADE.Data.Converters.Tests.csproj b/tests/MADE.Data.Converters.Tests/MADE.Data.Converters.Tests.csproj index 5a9e3d55..87aefd5c 100644 --- a/tests/MADE.Data.Converters.Tests/MADE.Data.Converters.Tests.csproj +++ b/tests/MADE.Data.Converters.Tests/MADE.Data.Converters.Tests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/tests/MADE.Data.Validation.Tests/MADE.Data.Validation.Tests.csproj b/tests/MADE.Data.Validation.Tests/MADE.Data.Validation.Tests.csproj index 7addcbe8..a420905b 100644 --- a/tests/MADE.Data.Validation.Tests/MADE.Data.Validation.Tests.csproj +++ b/tests/MADE.Data.Validation.Tests/MADE.Data.Validation.Tests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/tests/MADE.Diagnostics.Tests/MADE.Diagnostics.Tests.csproj b/tests/MADE.Diagnostics.Tests/MADE.Diagnostics.Tests.csproj index 6c1dfe0c..8be0c9bf 100644 --- a/tests/MADE.Diagnostics.Tests/MADE.Diagnostics.Tests.csproj +++ b/tests/MADE.Diagnostics.Tests/MADE.Diagnostics.Tests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/tests/MADE.Networking.Tests/MADE.Networking.Tests.csproj b/tests/MADE.Networking.Tests/MADE.Networking.Tests.csproj index 34167464..3939674c 100644 --- a/tests/MADE.Networking.Tests/MADE.Networking.Tests.csproj +++ b/tests/MADE.Networking.Tests/MADE.Networking.Tests.csproj @@ -14,8 +14,8 @@ - - + + diff --git a/tests/MADE.Web.Tests/MADE.Web.Tests.csproj b/tests/MADE.Web.Tests/MADE.Web.Tests.csproj index 3bc40c78..cefb1770 100644 --- a/tests/MADE.Web.Tests/MADE.Web.Tests.csproj +++ b/tests/MADE.Web.Tests/MADE.Web.Tests.csproj @@ -14,8 +14,8 @@ - - + + From 2d8db2f88cd5bf07b996946f79ffe81938a1a5e3 Mon Sep 17 00:00:00 2001 From: James Croft Date: Wed, 10 Nov 2021 21:22:15 +0000 Subject: [PATCH 2/2] Updated CI to support .NET 6 --- .github/workflows/ci.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 691570af..e5d250fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,12 +45,6 @@ jobs: echo "BUILD_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append shell: pwsh - - name: Setup NuGet - uses: NuGet/setup-nuget@v1.0.5 - - - name: Restore dependencies - run: nuget restore $SOLUTION - - name: Setup .NET Core 3.1 uses: actions/setup-dotnet@v1 with: @@ -61,6 +55,17 @@ jobs: with: dotnet-version: 5.0.x + - name: Setup .NET 6.0 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + + - name: Setup NuGet + uses: NuGet/setup-nuget@v1.0.5 + + - name: Restore dependencies + run: nuget restore $SOLUTION + - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.2