Update tooling to .NET 5 (#39)

* Update tooling to .NET 5 * Rename 'TaskCompletionSource' to 'DefaultPromise' (#30)
cuteant · May 15, 2021 · cf474a3 · cf474a3
1 parent 7e2252b
commit cf474a3
Show file tree

Hide file tree

Showing 101 changed files with 778 additions and 631 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,12 +8,15 @@
   <Import Project="$(SourceRoot)/build/Dependencies.3rdParty.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.AspNetCore.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.AspNetCore2.props" />
+  <Import Project="$(SourceRoot)/build/Dependencies.AspNetCore3.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.CuteAnt.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.Extensions.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.Extensions2.props" />
+  <Import Project="$(SourceRoot)/build/Dependencies.Extensions3.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.Roslyn.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.System.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.System2.props" />
+  <Import Project="$(SourceRoot)/build/Dependencies.System3.props" />
   <Import Project="$(SourceRoot)/build/Dependencies.Testing.props" />
 
   <!-- Ensure changes to this file cause project rebuilds. -->
@@ -29,7 +32,7 @@
 
   <!-- Common compile parameters -->
   <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <!--<LangVersion>latest</LangVersion>-->
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
@@ -44,6 +47,9 @@
     <ImportLibs>netcore</ImportLibs>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net5.0-windows7.0' ">
+    <DefineConstants>$(DefineConstants);NET50;NETCOREAPP;NETCOREAPP_2_0_GREATER;NETCOREAPP_2_1_GREATER;NETCOREAPP_2_X_GREATER;NETCOREAPP_3_0_GREATER;NETCOREAPP_3_1_GREATER;NET_4_0_GREATER;NET_4_5_GREATER;NET_4_6_GREATER</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <DefineConstants>$(DefineConstants);NETCOREAPP;NETCOREAPP_2_0_GREATER;NETCOREAPP_2_1_GREATER;NETCOREAPP_2_X_GREATER;NETCOREAPP_3_0_GREATER;NET_4_0_GREATER;NET_4_5_GREATER;NET_4_6_GREATER</DefineConstants>
   </PropertyGroup>
@@ -334,6 +340,19 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0|AnyCPU'">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>false</Optimize>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>5</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net5.0|AnyCPU'">
+    <DebugType>portable</DebugType>
+    <Optimize>true</Optimize>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>5</WarningLevel>
+  </PropertyGroup>
 
   <!-- Set output folder for created NuGet packages -->
   <PropertyGroup>

diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-3.1.404
+5.0.203
diff --git a/build.fsx b/build.fsx
diff --git a/build.ps1 b/build.ps1
@@ -30,13 +30,10 @@ Param(
 )
 
 $FakeVersion = "4.63.0"
-$DotNetChannel = "LTS";
-$DotNetVersion = "3.1.402";
-$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
-$NugetVersion = "5.7.0";
+$NugetVersion = "5.8.0";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
 
-$IncrementalistVersion = "0.2.2";
+$IncrementalistVersion = "0.4.0";
 
 # Make sure tools folder exists
 $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
@@ -46,49 +43,6 @@ if (!(Test-Path $ToolPath)) {
     New-Item -Path $ToolPath -Type directory | out-null
 }
 
-###########################################################################
-# INSTALL .NET CORE CLI
-###########################################################################
-
-Function Remove-PathVariable([string]$VariableToRemove)
-{
-    $path = [Environment]::GetEnvironmentVariable("PATH", "User")
-    if ($path -ne $null)
-    {
-        $newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
-        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
-    }
-
-    $path = [Environment]::GetEnvironmentVariable("PATH", "Process")
-    if ($path -ne $null)
-    {
-        $newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
-        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
-    }
-}
-
-# Get .NET Core CLI path if installed.
-$FoundDotNetCliVersion = $null;
-if (Get-Command dotnet -ErrorAction SilentlyContinue) {
-    $FoundDotNetCliVersion = dotnet --version;
-    $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
-}
-
-if($FoundDotNetCliVersion -ne $DotNetVersion) {
-    $InstallPath = Join-Path $PSScriptRoot ".dotnet"
-    if (!(Test-Path $InstallPath)) {
-        mkdir -Force $InstallPath | Out-Null;
-    }
-    (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath\dotnet-install.ps1");
-    & $InstallPath\dotnet-install.ps1 -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath -Architecture x64;
-
-    Remove-PathVariable "$InstallPath"
-    $env:PATH = "$InstallPath;$env:PATH"
-    $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
-}
-
 ###########################################################################
 # INSTALL NUGET
 ###########################################################################

diff --git a/build.sh b/build.sh
@@ -9,15 +9,16 @@ TOOLS_DIR=$SCRIPT_DIR/tools
 INCREMENTALIST_DIR=$TOOLS_DIR/incrementalist
 INCREMENTALIST_EXE=$INCREMENTALIST_DIR/Incrementalist.Cmd.exe
 NUGET_EXE=$TOOLS_DIR/nuget.exe
-NUGET_URL=https://dist.nuget.org/win-x86-commandline/v5.7.0/nuget.exe
+NUGET_URL=https://dist.nuget.org/win-x86-commandline/v5.8.0/nuget.exe
 FAKE_VERSION=4.63.0
 FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
 DOTNET_EXE=$SCRIPT_DIR/.dotnet/dotnet
-DOTNET_VERSION=3.1.402
+DOTNETCORE_VERSION=3.1.409
+DOTNET_VERSION=5.0.203
 DOTNET_INSTALLER_URL=https://dot.net/v1/dotnet-install.sh
 DOTNET_CHANNEL=LTS
 PROTOBUF_VERSION=3.4.0
-INCREMENTALIST_VERSION=0.2.2
+INCREMENTALIST_VERSION=0.4.0
 
 # Define default arguments.
 TARGET="Default"
@@ -44,22 +45,6 @@ if [ ! -d "$TOOLS_DIR" ]; then
   mkdir "$TOOLS_DIR"
 fi
 
-###########################################################################
-# INSTALL .NET CORE CLI
-###########################################################################
-
-echo "Installing .NET CLI..."
-if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
-  mkdir "$SCRIPT_DIR/.dotnet"
-fi
-curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" $DOTNET_INSTALLER_URL
-bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --channel $DOTNET_CHANNEL --install-dir .dotnet --no-path
-export PATH="$SCRIPT_DIR/.dotnet":$PATH
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-chmod -R 0755 ".dotnet"
-"$SCRIPT_DIR/.dotnet/dotnet" --info
-
 ###########################################################################
 # INSTALL NUGET
 ###########################################################################
@@ -96,7 +81,7 @@ fi
 # INSTALL Incrementalist
 ###########################################################################
 if [ ! -f "$INCREMENTALIST_EXE" ]; then
-    "$SCRIPT_DIR/.dotnet/dotnet" tool install Incrementalist.Cmd --version $INCREMENTALIST_VERSION --tool-path "$INCREMENTALIST_DIR"
+    dotnet tool install Incrementalist.Cmd --version $INCREMENTALIST_VERSION --tool-path "$INCREMENTALIST_DIR"
     if [ $? -ne 0 ]; then
         echo "Incrementalist already installed."
     fi

diff --git a/build/Dependencies.3rdParty.props b/build/Dependencies.3rdParty.props
@@ -2,29 +2,29 @@
   <!-- Shared Package Versions -->
   <PropertyGroup>
     <!-- Common packages -->
-    <BenDemystifierPackageVersion>0.1.6</BenDemystifierPackageVersion>
-    <CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
+    <BenDemystifierPackageVersion>0.4.1</BenDemystifierPackageVersion>
+    <CommandLineParserPackageVersion>2.8.0</CommandLineParserPackageVersion>
     <CronExpressionDescriptorPackageVersion>2.16.0</CronExpressionDescriptorPackageVersion>
     <FastMemberSigned13PackageVersion>1.3.0</FastMemberSigned13PackageVersion>
     <FastMemberSignedPackageVersion>1.5.0</FastMemberSignedPackageVersion>
     <MoreLinq2PackageVersion>2.10.0</MoreLinq2PackageVersion>
     <MoreLinqPackageVersion>3.3.2</MoreLinqPackageVersion>
     <NCrontabSignedPackageVersion>3.3.2</NCrontabSignedPackageVersion>
     <OptionalPackageVersion>4.0.0</OptionalPackageVersion>
-    <SystemLinqDynamicCorePackageVersion>1.2.6</SystemLinqDynamicCorePackageVersion>
+    <SystemLinqDynamicCorePackageVersion>1.2.9</SystemLinqDynamicCorePackageVersion>
     <SuperpowerPackageVersion>2.3.0</SuperpowerPackageVersion>
 
     <AutoMapperPackageVersion>10.1.1</AutoMapperPackageVersion>
-    <AutoMapperCollectionPackageVersion>5.0.0</AutoMapperCollectionPackageVersion>
+    <AutoMapperCollectionPackageVersion>7.0.1</AutoMapperCollectionPackageVersion>
 
     <ToolGoodWordsPackageVersion>3.0.2.4</ToolGoodWordsPackageVersion>
 
-    <PollyPackageVersion>7.2.1</PollyPackageVersion>
+    <PollyPackageVersion>7.2.2</PollyPackageVersion>
     <PollyCachingDistributedPackageVersion>3.0.1</PollyCachingDistributedPackageVersion>
     <PollyCachingMemoryPackageVersion>3.0.2</PollyCachingMemoryPackageVersion>
     <PollyExtensionsHttpPackageVersion>3.0.0</PollyExtensionsHttpPackageVersion>
 
-    <ReactivePropertyPackageVersion>5.3.0</ReactivePropertyPackageVersion>
+    <ReactivePropertyPackageVersion>7.10.0</ReactivePropertyPackageVersion>
     <ReactiveStreamsPackageVersion>1.0.2</ReactiveStreamsPackageVersion>
 
     <JetBrainsAnnotationsPackageVersion>2019.1.3</JetBrainsAnnotationsPackageVersion>
@@ -33,7 +33,7 @@
     <CastleCorePackageVersion>4.4.1</CastleCorePackageVersion>
 
     <!-- Ioc related packages -->
-    <AutofacPackageVersion>6.1.0</AutofacPackageVersion>
+    <AutofacPackageVersion>6.2.0</AutofacPackageVersion>
     <AutofacConfigurationPackageVersion>6.0.0</AutofacConfigurationPackageVersion>
     <AutofacExtensionsDependencyInjectionPackageVersion>7.1.0</AutofacExtensionsDependencyInjectionPackageVersion>
     <AutofacExtrasDynamicProxyPackageVersion>6.0.0</AutofacExtrasDynamicProxyPackageVersion>
@@ -47,12 +47,12 @@
     <Lz4netNETCoreSignedPackageVersion>1.0.15.93</Lz4netNETCoreSignedPackageVersion>
 
     <!-- Database related packages -->
-    <CsvHelperPackageVersion>18.0.0</CsvHelperPackageVersion>
+    <CsvHelperPackageVersion>27.0.2</CsvHelperPackageVersion>
     <DocumentFormatOpenXmlPackageVersion>2.10.1</DocumentFormatOpenXmlPackageVersion>
     <ExcelNumberFormatPackageVersion>1.0.10</ExcelNumberFormatPackageVersion>
     <RemotionLinqPackageVersion>2.2.0</RemotionLinqPackageVersion>
     <ConsulPackageVersion>0.7.2.6</ConsulPackageVersion>
-    <DapperStrongNamePackageVersion>2.0.35</DapperStrongNamePackageVersion>
+    <DapperStrongNamePackageVersion>2.0.90</DapperStrongNamePackageVersion>
     <MicrosoftSqlServerTypesPackageVersion>14.0.1016.290</MicrosoftSqlServerTypesPackageVersion>
     <MongoDBBsonPackageVersion>2.11.0</MongoDBBsonPackageVersion>
     <MongoDBDriverCorePackageVersion>2.11.0</MongoDBDriverCorePackageVersion>
@@ -77,10 +77,10 @@
     <SystemDataSQLiteCorePackageVersion>1.0.112.1</SystemDataSQLiteCorePackageVersion>
 
     <!-- Hosting related packages -->
-    <TopshelfPackageVersion>4.2.1</TopshelfPackageVersion>
-    <TopshelfExtensionsConfigurationPackageVersion>4.2.1</TopshelfExtensionsConfigurationPackageVersion>
-    <TopshelfNLogPackageVersion>4.2.1</TopshelfNLogPackageVersion>
-    <TopshelfSerilogPackageVersion>4.2.1</TopshelfSerilogPackageVersion>
+    <TopshelfPackageVersion>4.3.0</TopshelfPackageVersion>
+    <TopshelfExtensionsConfigurationPackageVersion>4.3.0</TopshelfExtensionsConfigurationPackageVersion>
+    <TopshelfNLogPackageVersion>4.3.0</TopshelfNLogPackageVersion>
+    <TopshelfSerilogPackageVersion>4.3.0</TopshelfSerilogPackageVersion>
 
     <!-- Logging related packages -->
     <NLogPackageVersion>4.7.6</NLogPackageVersion>
@@ -143,22 +143,22 @@
     <RabbitMQClientPackageVersion>5.1.0</RabbitMQClientPackageVersion>
 
     <LibuvPackageVersion>1.10.0</LibuvPackageVersion>
-    <LibuvSharedPackageVersion>1.34.0.266</LibuvSharedPackageVersion>
+    <LibuvSharedPackageVersion>1.40.0.394</LibuvSharedPackageVersion>
 
-    <MimeKitPackageVersion>2.10.1</MimeKitPackageVersion>
-    <MailKitPackageVersion>2.10.1</MailKitPackageVersion>
+    <MimeKitPackageVersion>2.11.0</MimeKitPackageVersion>
+    <MailKitPackageVersion>2.11.0</MailKitPackageVersion>
 
     <!-- Serialization related packages -->
-    <GoogleApiCommonProtosPackageVersion>1.6.0</GoogleApiCommonProtosPackageVersion>
-    <GoogleProtobufPackageVersion>3.12.3</GoogleProtobufPackageVersion>
-    <GoogleProtobufToolsPackageVersion>3.12.3</GoogleProtobufToolsPackageVersion>
-    <HyperionPackageVersion>0.9.16</HyperionPackageVersion>
-    <MessagePackAnalyzerPackageVersion>1.7.3.7</MessagePackAnalyzerPackageVersion>
+    <GoogleApiCommonProtosPackageVersion>2.3.0</GoogleApiCommonProtosPackageVersion>
+    <GoogleProtobufPackageVersion>3.16.0</GoogleProtobufPackageVersion>
+    <GoogleProtobufToolsPackageVersion>3.16.0</GoogleProtobufToolsPackageVersion>
+    <HyperionPackageVersion>0.10.1</HyperionPackageVersion>
+    <MessagePackAnalyzerPackageVersion>2.2.85</MessagePackAnalyzerPackageVersion>
     <NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>
-    <NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
-    <ProtobufNetPackageVersion>2.4.6</ProtobufNetPackageVersion>
-    <ProtobufNetDevPackageVersion>3.0.0-alpha.155</ProtobufNetDevPackageVersion>
+    <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
+    <ProtobufNet2PackageVersion>2.4.6</ProtobufNet2PackageVersion>
+    <ProtobufNetPackageVersion>3.0.101</ProtobufNetPackageVersion>
     <ProtobufNetDataPackageVersion>3.0.1</ProtobufNetDataPackageVersion>
-    <YamlDotNetPackageVersion>9.1.0</YamlDotNetPackageVersion>
+    <YamlDotNetPackageVersion>11.1.1</YamlDotNetPackageVersion>
   </PropertyGroup>
 </Project>