Upgrade to .NET 6

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.177.0/containers/dotnet/.devcontainer/base.Dockerfile
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/main/containers/dotnet/.devcontainer/base.Dockerfile
 
-# [Choice] .NET version: 5.0, 3.1, 2.1
-ARG VARIANT=3.1
+# [Choice] .NET version: 6.0, 5.0, 3.1, 2.1
+ARG VARIANT=6.0
 FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}

.github/workflows/main.yml

@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --no-restore
-    - name: Test
-      run: dotnet test --no-build --verbosity normal
+      - uses: actions/checkout@v2
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
+      - name: Restore dependencies
+        run: dotnet restore
+      - name: Build
+        run: dotnet build --no-restore
+      - name: Test
+        run: dotnet test --no-build --verbosity normal

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: 6.0.x
     - name: Test
       run: dotnet test --verbosity normal
 
@@ -40,7 +40,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: 6.0.x
     - name: Publish
       run: dotnet publish src/BaGet --configuration Release --output artifacts
     - name: Upload
@@ -59,7 +59,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: 6.0.x
     - name: Pack
       run: dotnet pack --configuration Release --output artifacts
     - name: Push

Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:3.1 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:3.1 AS build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
 COPY /src .
 RUN dotnet restore BaGet

samples/BaGet.Protocol.Samples.Tests/BaGet.Protocol.Samples.Tests.csproj

@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>IDE0007</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Moq" Version="4.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

samples/BaGetWebApplication/BaGetWebApplication.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/BaGet.Aliyun/BaGet.Aliyun.csproj

@@ -2,11 +2,11 @@
   <PropertyGroup>
     <PackageTags>NuGet;Alibaba;Cloud</PackageTags>
     <Description>The libraries to host BaGet on Alibaba Cloud (Aliyun).</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.9.1" />
+    <PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
   </ItemGroup>
 
   <ItemGroup>

src/BaGet.Aws/BaGet.Aws.csproj

@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-
+    <TargetFramework>net6.0</TargetFramework>
     <PackageTags>NuGet;Amazon;Cloud</PackageTags>
     <Description>The libraries to host BaGet on AWS.</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.3.110.20" />
-    <PackageReference Include="AWSSDK.SecurityToken" Version="3.3.104.27" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.7.22" />
+    <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.1.115" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsPackageVersion)" />
   </ItemGroup>
 

src/BaGet.Azure/BaGet.Azure.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-
+    <TargetFramework>net6.0</TargetFramework>
     <PackageTags>NuGet;Azure;Cloud</PackageTags>
     <Description>The libraries to host BaGet on Azure.</Description>
   </PropertyGroup>

src/BaGet.Core/BaGet.Core.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-
+    <TargetFramework>net6.0</TargetFramework>
     <PackageTags>NuGet</PackageTags>
     <Description>The core libraries that power BaGet.</Description>
   </PropertyGroup>
@@ -13,7 +12,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsPackageVersion)" />
     <PackageReference Include="NuGet.Protocol" Version="$(NuGetPackageVersion)" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
+    <PackageReference Include="System.Reflection.Metadata" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/BaGet.Database.MySql/BaGet.Database.MySql.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
 
     <PackageTags>NuGet</PackageTags>
     <Description>The libraries to host BaGet on MySQL.</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/BaGet.Database.MySql/Migrations/20181212113156_Initial.cs

@@ -8,32 +8,50 @@ public partial class Initial : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.AlterDatabase()
+                .Annotation("MySql:CharSet", "utf8mb4");
+
             migrationBuilder.CreateTable(
                 name: "Packages",
                 columns: table => new
                 {
-                    Key = table.Column<int>(nullable: false)
+                    Key = table.Column<int>(type: "int", nullable: false)
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    Id = table.Column<string>(maxLength: 128, nullable: false),
-                    Authors = table.Column<string>(maxLength: 4000, nullable: true),
-                    Description = table.Column<string>(maxLength: 4000, nullable: true),
-                    Downloads = table.Column<long>(nullable: false),
-                    HasReadme = table.Column<bool>(nullable: false),
-                    Language = table.Column<string>(maxLength: 20, nullable: true),
-                    Listed = table.Column<bool>(nullable: false),
-                    MinClientVersion = table.Column<string>(maxLength: 44, nullable: true),
-                    Published = table.Column<DateTime>(nullable: false),
-                    RequireLicenseAcceptance = table.Column<bool>(nullable: false),
-                    Summary = table.Column<string>(maxLength: 4000, nullable: true),
-                    Title = table.Column<string>(maxLength: 256, nullable: true),
-                    IconUrl = table.Column<string>(maxLength: 4000, nullable: true),
-                    LicenseUrl = table.Column<string>(maxLength: 4000, nullable: true),
-                    ProjectUrl = table.Column<string>(maxLength: 4000, nullable: true),
-                    RepositoryUrl = table.Column<string>(maxLength: 4000, nullable: true),
-                    RepositoryType = table.Column<string>(maxLength: 100, nullable: true),
-                    Tags = table.Column<string>(maxLength: 4000, nullable: true),
-                    RowVersion = table.Column<DateTime>(rowVersion: true, nullable: true),
-                    Version = table.Column<string>(maxLength: 64, nullable: false)
+                    Id = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Authors = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Downloads = table.Column<long>(type: "bigint", nullable: false),
+                    HasReadme = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    Language = table.Column<string>(type: "varchar(20)", maxLength: 20, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Listed = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    MinClientVersion = table.Column<string>(type: "varchar(44)", maxLength: 44, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Published = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    RequireLicenseAcceptance = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    Summary = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Title = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IconUrl = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LicenseUrl = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ProjectUrl = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    RepositoryUrl = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    RepositoryType = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Tags = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    RowVersion = table.Column<DateTime>(type: "timestamp(6)", rowVersion: true, nullable: true)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.ComputedColumn),
+                    Version = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
                 },
                 constraints: table =>
                 {
@@ -44,12 +62,15 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "PackageDependencies",
                 columns: table => new
                 {
-                    Key = table.Column<int>(nullable: false)
+                    Key = table.Column<int>(type: "int", nullable: false)
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    Id = table.Column<string>(maxLength: 128, nullable: true),
-                    VersionRange = table.Column<string>(maxLength: 256, nullable: true),
-                    TargetFramework = table.Column<string>(maxLength: 256, nullable: true),
-                    PackageKey = table.Column<int>(nullable: false)
+                    Id = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    VersionRange = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    TargetFramework = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    PackageKey = table.Column<int>(type: "int", nullable: true)
                 },
                 constraints: table =>
                 {

src/BaGet.Database.MySql/Migrations/20190303071640_AddSearchDimensions.cs

@@ -12,23 +12,17 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "FK_PackageDependencies_Packages_PackageKey",
                 table: "PackageDependencies");
 
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "RowVersion",
-                table: "Packages",
-                rowVersion: true,
-                nullable: true,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
             migrationBuilder.AddColumn<bool>(
                 name: "IsPrerelease",
                 table: "Packages",
+                type: "tinyint(1)",
                 nullable: false,
                 defaultValue: false);
 
             migrationBuilder.AddColumn<int>(
                 name: "SemVerLevel",
                 table: "Packages",
+                type: "int",
                 nullable: false,
                 defaultValue: 0);
 
@@ -42,11 +36,13 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "PackageTypes",
                 columns: table => new
                 {
-                    Key = table.Column<int>(nullable: false)
+                    Key = table.Column<int>(type: "int", nullable: false)
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    Name = table.Column<string>(maxLength: 512, nullable: true),
-                    Version = table.Column<string>(maxLength: 64, nullable: true),
-                    PackageKey = table.Column<int>(nullable: false)
+                    Name = table.Column<string>(type: "varchar(255)", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Version = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    PackageKey = table.Column<int>(type: "int", nullable: false)
                 },
                 constraints: table =>
                 {
@@ -63,10 +59,11 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "TargetFrameworks",
                 columns: table => new
                 {
-                    Key = table.Column<int>(nullable: false)
+                    Key = table.Column<int>(type: "int", nullable: false)
                         .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
-                    Moniker = table.Column<string>(maxLength: 256, nullable: true),
-                    PackageKey = table.Column<int>(nullable: false)
+                    Moniker = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    PackageKey = table.Column<int>(type: "int", nullable: false)
                 },
                 constraints: table =>
                 {
@@ -137,14 +134,6 @@ protected override void Down(MigrationBuilder migrationBuilder)
                 name: "SemVerLevel",
                 table: "Packages");
 
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "RowVersion",
-                table: "Packages",
-                nullable: true,
-                oldClrType: typeof(DateTime),
-                oldRowVersion: true,
-                oldNullable: true);
-
             migrationBuilder.AlterColumn<int>(
                 name: "PackageKey",
                 table: "PackageDependencies",

src/BaGet.Database.MySql/Migrations/20190914215810_AddOriginalVersionStringColumn.cs

@@ -7,17 +7,10 @@ public partial class AddOriginalVersionStringColumn : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "RowVersion",
-                table: "Packages",
-                rowVersion: true,
-                nullable: true,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
             migrationBuilder.AddColumn<string>(
                 name: "OriginalVersion",
                 table: "Packages",
+                type: "varchar(64)",
                 maxLength: 64,
                 nullable: true);
         }
@@ -27,14 +20,6 @@ protected override void Down(MigrationBuilder migrationBuilder)
             migrationBuilder.DropColumn(
                 name: "OriginalVersion",
                 table: "Packages");
-
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "RowVersion",
-                table: "Packages",
-                nullable: true,
-                oldClrType: typeof(DateTime),
-                oldRowVersion: true,
-                oldNullable: true);
         }
     }
 }