Skip to content

Commit cf474a3

Browse files
cuteantcuteant
authored
Update tooling to .NET 5 (#39)
* Update tooling to .NET 5 * Rename 'TaskCompletionSource' to 'DefaultPromise' (#30)
1 parent 7e2252b commit cf474a3

File tree

101 files changed

+778
-631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+778
-631
lines changed

‎Directory.Build.props

+20-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
<Import Project="$(SourceRoot)/build/Dependencies.3rdParty.props" />
99
<Import Project="$(SourceRoot)/build/Dependencies.AspNetCore.props" />
1010
<Import Project="$(SourceRoot)/build/Dependencies.AspNetCore2.props" />
11+
<Import Project="$(SourceRoot)/build/Dependencies.AspNetCore3.props" />
1112
<Import Project="$(SourceRoot)/build/Dependencies.CuteAnt.props" />
1213
<Import Project="$(SourceRoot)/build/Dependencies.Extensions.props" />
1314
<Import Project="$(SourceRoot)/build/Dependencies.Extensions2.props" />
15+
<Import Project="$(SourceRoot)/build/Dependencies.Extensions3.props" />
1416
<Import Project="$(SourceRoot)/build/Dependencies.Roslyn.props" />
1517
<Import Project="$(SourceRoot)/build/Dependencies.System.props" />
1618
<Import Project="$(SourceRoot)/build/Dependencies.System2.props" />
19+
<Import Project="$(SourceRoot)/build/Dependencies.System3.props" />
1720
<Import Project="$(SourceRoot)/build/Dependencies.Testing.props" />
1821

1922
<!-- Ensure changes to this file cause project rebuilds. -->
@@ -29,7 +32,7 @@
2932

3033
<!-- Common compile parameters -->
3134
<PropertyGroup>
32-
<LangVersion>8.0</LangVersion>
35+
<LangVersion>9.0</LangVersion>
3336
<!--<LangVersion>latest</LangVersion>-->
3437
<PlatformTarget>AnyCPU</PlatformTarget>
3538
<Prefer32Bit>false</Prefer32Bit>
@@ -44,6 +47,9 @@
4447
<ImportLibs>netcore</ImportLibs>
4548
</PropertyGroup>
4649

50+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net5.0-windows7.0' ">
51+
<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>
52+
</PropertyGroup>
4753
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
4854
<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>
4955
</PropertyGroup>
@@ -334,6 +340,19 @@
334340
<ErrorReport>prompt</ErrorReport>
335341
<WarningLevel>4</WarningLevel>
336342
</PropertyGroup>
343+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net5.0|AnyCPU'">
344+
<DebugSymbols>True</DebugSymbols>
345+
<DebugType>portable</DebugType>
346+
<Optimize>false</Optimize>
347+
<ErrorReport>prompt</ErrorReport>
348+
<WarningLevel>5</WarningLevel>
349+
</PropertyGroup>
350+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net5.0|AnyCPU'">
351+
<DebugType>portable</DebugType>
352+
<Optimize>true</Optimize>
353+
<ErrorReport>prompt</ErrorReport>
354+
<WarningLevel>5</WarningLevel>
355+
</PropertyGroup>
337356

338357
<!-- Set output folder for created NuGet packages -->
339358
<PropertyGroup>

‎DotnetCLIVersion.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.404
1+
5.0.203

‎build.fsx

+107-78
Large diffs are not rendered by default.

‎build.ps1

+2-48
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,10 @@ Param(
3030
)
3131

3232
$FakeVersion = "4.63.0"
33-
$DotNetChannel = "LTS";
34-
$DotNetVersion = "3.1.402";
35-
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
36-
$NugetVersion = "5.7.0";
33+
$NugetVersion = "5.8.0";
3734
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe"
3835

39-
$IncrementalistVersion = "0.2.2";
36+
$IncrementalistVersion = "0.4.0";
4037

4138
# Make sure tools folder exists
4239
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
@@ -46,49 +43,6 @@ if (!(Test-Path $ToolPath)) {
4643
New-Item -Path $ToolPath -Type directory | out-null
4744
}
4845

49-
###########################################################################
50-
# INSTALL .NET CORE CLI
51-
###########################################################################
52-
53-
Function Remove-PathVariable([string]$VariableToRemove)
54-
{
55-
$path = [Environment]::GetEnvironmentVariable("PATH", "User")
56-
if ($path -ne $null)
57-
{
58-
$newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
59-
[Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
60-
}
61-
62-
$path = [Environment]::GetEnvironmentVariable("PATH", "Process")
63-
if ($path -ne $null)
64-
{
65-
$newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
66-
[Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
67-
}
68-
}
69-
70-
# Get .NET Core CLI path if installed.
71-
$FoundDotNetCliVersion = $null;
72-
if (Get-Command dotnet -ErrorAction SilentlyContinue) {
73-
$FoundDotNetCliVersion = dotnet --version;
74-
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
75-
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
76-
}
77-
78-
if($FoundDotNetCliVersion -ne $DotNetVersion) {
79-
$InstallPath = Join-Path $PSScriptRoot ".dotnet"
80-
if (!(Test-Path $InstallPath)) {
81-
mkdir -Force $InstallPath | Out-Null;
82-
}
83-
(New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath\dotnet-install.ps1");
84-
& $InstallPath\dotnet-install.ps1 -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath -Architecture x64;
85-
86-
Remove-PathVariable "$InstallPath"
87-
$env:PATH = "$InstallPath;$env:PATH"
88-
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
89-
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
90-
}
91-
9246
###########################################################################
9347
# INSTALL NUGET
9448
###########################################################################

‎build.sh

+5-20
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ TOOLS_DIR=$SCRIPT_DIR/tools
99
INCREMENTALIST_DIR=$TOOLS_DIR/incrementalist
1010
INCREMENTALIST_EXE=$INCREMENTALIST_DIR/Incrementalist.Cmd.exe
1111
NUGET_EXE=$TOOLS_DIR/nuget.exe
12-
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v5.7.0/nuget.exe
12+
NUGET_URL=https://dist.nuget.org/win-x86-commandline/v5.8.0/nuget.exe
1313
FAKE_VERSION=4.63.0
1414
FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe
1515
DOTNET_EXE=$SCRIPT_DIR/.dotnet/dotnet
16-
DOTNET_VERSION=3.1.402
16+
DOTNETCORE_VERSION=3.1.409
17+
DOTNET_VERSION=5.0.203
1718
DOTNET_INSTALLER_URL=https://dot.net/v1/dotnet-install.sh
1819
DOTNET_CHANNEL=LTS
1920
PROTOBUF_VERSION=3.4.0
20-
INCREMENTALIST_VERSION=0.2.2
21+
INCREMENTALIST_VERSION=0.4.0
2122

2223
# Define default arguments.
2324
TARGET="Default"
@@ -44,22 +45,6 @@ if [ ! -d "$TOOLS_DIR" ]; then
4445
mkdir "$TOOLS_DIR"
4546
fi
4647

47-
###########################################################################
48-
# INSTALL .NET CORE CLI
49-
###########################################################################
50-
51-
echo "Installing .NET CLI..."
52-
if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
53-
mkdir "$SCRIPT_DIR/.dotnet"
54-
fi
55-
curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" $DOTNET_INSTALLER_URL
56-
bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --channel $DOTNET_CHANNEL --install-dir .dotnet --no-path
57-
export PATH="$SCRIPT_DIR/.dotnet":$PATH
58-
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
59-
export DOTNET_CLI_TELEMETRY_OPTOUT=1
60-
chmod -R 0755 ".dotnet"
61-
"$SCRIPT_DIR/.dotnet/dotnet" --info
62-
6348
###########################################################################
6449
# INSTALL NUGET
6550
###########################################################################
@@ -96,7 +81,7 @@ fi
9681
# INSTALL Incrementalist
9782
###########################################################################
9883
if [ ! -f "$INCREMENTALIST_EXE" ]; then
99-
"$SCRIPT_DIR/.dotnet/dotnet" tool install Incrementalist.Cmd --version $INCREMENTALIST_VERSION --tool-path "$INCREMENTALIST_DIR"
84+
dotnet tool install Incrementalist.Cmd --version $INCREMENTALIST_VERSION --tool-path "$INCREMENTALIST_DIR"
10085
if [ $? -ne 0 ]; then
10186
echo "Incrementalist already installed."
10287
fi

‎build/Dependencies.3rdParty.props

+25-25
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22
<!-- Shared Package Versions -->
33
<PropertyGroup>
44
<!-- Common packages -->
5-
<BenDemystifierPackageVersion>0.1.6</BenDemystifierPackageVersion>
6-
<CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
5+
<BenDemystifierPackageVersion>0.4.1</BenDemystifierPackageVersion>
6+
<CommandLineParserPackageVersion>2.8.0</CommandLineParserPackageVersion>
77
<CronExpressionDescriptorPackageVersion>2.16.0</CronExpressionDescriptorPackageVersion>
88
<FastMemberSigned13PackageVersion>1.3.0</FastMemberSigned13PackageVersion>
99
<FastMemberSignedPackageVersion>1.5.0</FastMemberSignedPackageVersion>
1010
<MoreLinq2PackageVersion>2.10.0</MoreLinq2PackageVersion>
1111
<MoreLinqPackageVersion>3.3.2</MoreLinqPackageVersion>
1212
<NCrontabSignedPackageVersion>3.3.2</NCrontabSignedPackageVersion>
1313
<OptionalPackageVersion>4.0.0</OptionalPackageVersion>
14-
<SystemLinqDynamicCorePackageVersion>1.2.6</SystemLinqDynamicCorePackageVersion>
14+
<SystemLinqDynamicCorePackageVersion>1.2.9</SystemLinqDynamicCorePackageVersion>
1515
<SuperpowerPackageVersion>2.3.0</SuperpowerPackageVersion>
1616

1717
<AutoMapperPackageVersion>10.1.1</AutoMapperPackageVersion>
18-
<AutoMapperCollectionPackageVersion>5.0.0</AutoMapperCollectionPackageVersion>
18+
<AutoMapperCollectionPackageVersion>7.0.1</AutoMapperCollectionPackageVersion>
1919

2020
<ToolGoodWordsPackageVersion>3.0.2.4</ToolGoodWordsPackageVersion>
2121

22-
<PollyPackageVersion>7.2.1</PollyPackageVersion>
22+
<PollyPackageVersion>7.2.2</PollyPackageVersion>
2323
<PollyCachingDistributedPackageVersion>3.0.1</PollyCachingDistributedPackageVersion>
2424
<PollyCachingMemoryPackageVersion>3.0.2</PollyCachingMemoryPackageVersion>
2525
<PollyExtensionsHttpPackageVersion>3.0.0</PollyExtensionsHttpPackageVersion>
2626

27-
<ReactivePropertyPackageVersion>5.3.0</ReactivePropertyPackageVersion>
27+
<ReactivePropertyPackageVersion>7.10.0</ReactivePropertyPackageVersion>
2828
<ReactiveStreamsPackageVersion>1.0.2</ReactiveStreamsPackageVersion>
2929

3030
<JetBrainsAnnotationsPackageVersion>2019.1.3</JetBrainsAnnotationsPackageVersion>
@@ -33,7 +33,7 @@
3333
<CastleCorePackageVersion>4.4.1</CastleCorePackageVersion>
3434

3535
<!-- Ioc related packages -->
36-
<AutofacPackageVersion>6.1.0</AutofacPackageVersion>
36+
<AutofacPackageVersion>6.2.0</AutofacPackageVersion>
3737
<AutofacConfigurationPackageVersion>6.0.0</AutofacConfigurationPackageVersion>
3838
<AutofacExtensionsDependencyInjectionPackageVersion>7.1.0</AutofacExtensionsDependencyInjectionPackageVersion>
3939
<AutofacExtrasDynamicProxyPackageVersion>6.0.0</AutofacExtrasDynamicProxyPackageVersion>
@@ -47,12 +47,12 @@
4747
<Lz4netNETCoreSignedPackageVersion>1.0.15.93</Lz4netNETCoreSignedPackageVersion>
4848

4949
<!-- Database related packages -->
50-
<CsvHelperPackageVersion>18.0.0</CsvHelperPackageVersion>
50+
<CsvHelperPackageVersion>27.0.2</CsvHelperPackageVersion>
5151
<DocumentFormatOpenXmlPackageVersion>2.10.1</DocumentFormatOpenXmlPackageVersion>
5252
<ExcelNumberFormatPackageVersion>1.0.10</ExcelNumberFormatPackageVersion>
5353
<RemotionLinqPackageVersion>2.2.0</RemotionLinqPackageVersion>
5454
<ConsulPackageVersion>0.7.2.6</ConsulPackageVersion>
55-
<DapperStrongNamePackageVersion>2.0.35</DapperStrongNamePackageVersion>
55+
<DapperStrongNamePackageVersion>2.0.90</DapperStrongNamePackageVersion>
5656
<MicrosoftSqlServerTypesPackageVersion>14.0.1016.290</MicrosoftSqlServerTypesPackageVersion>
5757
<MongoDBBsonPackageVersion>2.11.0</MongoDBBsonPackageVersion>
5858
<MongoDBDriverCorePackageVersion>2.11.0</MongoDBDriverCorePackageVersion>
@@ -77,10 +77,10 @@
7777
<SystemDataSQLiteCorePackageVersion>1.0.112.1</SystemDataSQLiteCorePackageVersion>
7878

7979
<!-- Hosting related packages -->
80-
<TopshelfPackageVersion>4.2.1</TopshelfPackageVersion>
81-
<TopshelfExtensionsConfigurationPackageVersion>4.2.1</TopshelfExtensionsConfigurationPackageVersion>
82-
<TopshelfNLogPackageVersion>4.2.1</TopshelfNLogPackageVersion>
83-
<TopshelfSerilogPackageVersion>4.2.1</TopshelfSerilogPackageVersion>
80+
<TopshelfPackageVersion>4.3.0</TopshelfPackageVersion>
81+
<TopshelfExtensionsConfigurationPackageVersion>4.3.0</TopshelfExtensionsConfigurationPackageVersion>
82+
<TopshelfNLogPackageVersion>4.3.0</TopshelfNLogPackageVersion>
83+
<TopshelfSerilogPackageVersion>4.3.0</TopshelfSerilogPackageVersion>
8484

8585
<!-- Logging related packages -->
8686
<NLogPackageVersion>4.7.6</NLogPackageVersion>
@@ -143,22 +143,22 @@
143143
<RabbitMQClientPackageVersion>5.1.0</RabbitMQClientPackageVersion>
144144

145145
<LibuvPackageVersion>1.10.0</LibuvPackageVersion>
146-
<LibuvSharedPackageVersion>1.34.0.266</LibuvSharedPackageVersion>
146+
<LibuvSharedPackageVersion>1.40.0.394</LibuvSharedPackageVersion>
147147

148-
<MimeKitPackageVersion>2.10.1</MimeKitPackageVersion>
149-
<MailKitPackageVersion>2.10.1</MailKitPackageVersion>
148+
<MimeKitPackageVersion>2.11.0</MimeKitPackageVersion>
149+
<MailKitPackageVersion>2.11.0</MailKitPackageVersion>
150150

151151
<!-- Serialization related packages -->
152-
<GoogleApiCommonProtosPackageVersion>1.6.0</GoogleApiCommonProtosPackageVersion>
153-
<GoogleProtobufPackageVersion>3.12.3</GoogleProtobufPackageVersion>
154-
<GoogleProtobufToolsPackageVersion>3.12.3</GoogleProtobufToolsPackageVersion>
155-
<HyperionPackageVersion>0.9.16</HyperionPackageVersion>
156-
<MessagePackAnalyzerPackageVersion>1.7.3.7</MessagePackAnalyzerPackageVersion>
152+
<GoogleApiCommonProtosPackageVersion>2.3.0</GoogleApiCommonProtosPackageVersion>
153+
<GoogleProtobufPackageVersion>3.16.0</GoogleProtobufPackageVersion>
154+
<GoogleProtobufToolsPackageVersion>3.16.0</GoogleProtobufToolsPackageVersion>
155+
<HyperionPackageVersion>0.10.1</HyperionPackageVersion>
156+
<MessagePackAnalyzerPackageVersion>2.2.85</MessagePackAnalyzerPackageVersion>
157157
<NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>
158-
<NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
159-
<ProtobufNetPackageVersion>2.4.6</ProtobufNetPackageVersion>
160-
<ProtobufNetDevPackageVersion>3.0.0-alpha.155</ProtobufNetDevPackageVersion>
158+
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
159+
<ProtobufNet2PackageVersion>2.4.6</ProtobufNet2PackageVersion>
160+
<ProtobufNetPackageVersion>3.0.101</ProtobufNetPackageVersion>
161161
<ProtobufNetDataPackageVersion>3.0.1</ProtobufNetDataPackageVersion>
162-
<YamlDotNetPackageVersion>9.1.0</YamlDotNetPackageVersion>
162+
<YamlDotNetPackageVersion>11.1.1</YamlDotNetPackageVersion>
163163
</PropertyGroup>
164164
</Project>

0 commit comments

Comments
 (0)