Skip to content

Commit d2a1346

Browse files
jamesmcroftjamesmcroft
authored
Merge pull request #182 from MADE-Apps/feature/nuget
Updated package references
2 parents f8b6ab3 + 2d8db2f commit d2a1346

File tree

15 files changed

+49
-46
lines changed

15 files changed

+49
-46
lines changed

‎.github/workflows/ci.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ jobs:
4545
echo "BUILD_VERSION=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
4646
shell: pwsh
4747

48-
- name: Setup NuGet
49-
uses: NuGet/[email protected]
50-
51-
- name: Restore dependencies
52-
run: nuget restore $SOLUTION
53-
5448
- name: Setup .NET Core 3.1
5549
uses: actions/setup-dotnet@v1
5650
with:
@@ -61,6 +55,17 @@ jobs:
6155
with:
6256
dotnet-version: 5.0.x
6357

58+
- name: Setup .NET 6.0
59+
uses: actions/setup-dotnet@v1
60+
with:
61+
dotnet-version: 6.0.x
62+
63+
- name: Setup NuGet
64+
uses: NuGet/[email protected]
65+
66+
- name: Restore dependencies
67+
run: nuget restore $SOLUTION
68+
6469
- name: Setup MSBuild
6570
uses: microsoft/[email protected]
6671

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReleaseNotes>https://github.com/MADE-Apps/MADE.NET/releases</PackageReleaseNotes>
1717
<NeutralLanguage>en</NeutralLanguage>
1818
<GenerateDocumentationFile>true</GenerateDocumentationFile>
19-
<LangVersion>8.0</LangVersion>
19+
<LangVersion>latest</LangVersion>
2020
</PropertyGroup>
2121

2222
<ItemGroup>
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0" PrivateAssets="All"/>
28+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
2929
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
3030
</ItemGroup>
3131

‎samples/MADE.Samples/MADE.Samples.UWP/MADE.Samples.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<ItemGroup>
55
<PackageReference Include="ColorCode.UWP">
6-
<Version>2.0.11</Version>
6+
<Version>2.0.12</Version>
77
</PackageReference>
88
<PackageReference Include="CommunityToolkit.Mvvm">
99
<Version>7.0.3</Version>

‎samples/MADE.Samples/MADE.Samples.Wasm/MADE.Samples.Wasm.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
<NoWarn>NU1701</NoWarn>
77
</PropertyGroup>
88
<PropertyGroup Condition="'$(Configuration)'=='Debug'">

‎src/MADE.Data.EFCore/IEntityBase.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MADE.Data.EFCore
1+
namespace MADE.Data.EFCore
22
{
33
using System;
44

@@ -15,12 +15,11 @@ public interface IEntityBase
1515
/// <summary>
1616
/// Gets or sets the date of the entity's creation.
1717
/// </summary>
18-
DateTime CreatedDate { get; set; }
18+
DateTime CreatedDate { get; set; }
1919

2020
/// <summary>
2121
/// Gets or sets the date of the entity's last update.
2222
/// </summary>
23-
DateTime? UpdatedDate { get; set; }
24-
23+
DateTime? UpdatedDate { get; set; }
2524
}
2625
}

‎src/MADE.Data.EFCore/MADE.Data.EFCore.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Product>MADE.NET Entity Framework</Product>
77
<Description>
@@ -14,12 +14,16 @@
1414

1515
</PropertyGroup>
1616

17+
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
19+
</ItemGroup>
20+
1721
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
18-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.11" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.12" />
1923
</ItemGroup>
2024

2125
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
22-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.20" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.21" />
2327
</ItemGroup>
2428

2529
</Project>

‎src/MADE.UI.Controls.FilePicker/FilePickerItem.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ namespace MADE.UI.Controls
66
using System;
77
using System.Threading.Tasks;
88
using Windows.Storage;
9-
using Windows.Storage.FileProperties;
109
using Windows.UI.Xaml.Media.Imaging;
1110

1211
/// <summary>
@@ -53,15 +52,10 @@ public override string ToString()
5352

5453
internal async Task LoadThumbnailAsync()
5554
{
55+
#if WINDOWS_UWP
5656
if (this.File != null)
5757
{
58-
StorageItemThumbnail thumbnail;
59-
60-
#if WINDOWS_UWP
61-
thumbnail = await this.File.GetThumbnailAsync(Windows.Storage.FileProperties.ThumbnailMode.SingleItem, 256, ThumbnailOptions.ResizeThumbnail);
62-
#else
63-
thumbnail = null;
64-
#endif
58+
var thumbnail = await this.File.GetThumbnailAsync(Windows.Storage.FileProperties.ThumbnailMode.SingleItem, 256, Windows.Storage.FileProperties.ThumbnailOptions.ResizeThumbnail);
6559

6660
if (thumbnail == null)
6761
{
@@ -71,6 +65,9 @@ internal async Task LoadThumbnailAsync()
7165
this.Thumbnail = new BitmapImage();
7266
this.Thumbnail.SetSource(thumbnail.CloneStream());
7367
}
68+
#else
69+
await Task.CompletedTask;
70+
#endif
7471
}
7572
}
7673
}

‎src/MADE.Web.Mvc/MADE.Web.Mvc.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Product>MADE.NET Web MVC</Product>
77
<Description>
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
16+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1717
</ItemGroup>
1818

1919
</Project>

‎src/MADE.Web/MADE.Web.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Product>MADE.NET Web</Product>
77
<Description>
@@ -15,12 +15,10 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
19-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
20-
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
21-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" />
18+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
2422
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2523
</ItemGroup>
2624

‎tests/MADE.Collections.Tests/MADE.Collections.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</PackageReference>
1515
<PackageReference Include="Moq" Version="4.16.1" />
1616
<PackageReference Include="NUnit" Version="3.13.2" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
17+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1919
<PackageReference Include="Shouldly" Version="4.0.3" />
2020
</ItemGroup>
2121

0 commit comments

Comments
 (0)