Skip to content

Commit c93cb1b

Browse files
emgartenemgarten
authored
Add net9.0 support (#207)
1 parent df1a358 commit c93cb1b

File tree

10 files changed

+31
-16
lines changed

10 files changed

+31
-16
lines changed

‎ReleaseNotes.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release Notes
22

3+
## 6.3.0
4+
* Added net9.0 support
5+
* Updated NuGet.* packages to 6.12.1
6+
37
## 6.2.0
48
* S3 support for setting an ACL on upload. Feeds using scaleway object storage can now make files public during push.
59

‎build/common/common.ps1‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Function Install-DotnetCLI {
2424

2525
& $installDotnet -Channel 6.0 -i $CLIRoot
2626
& $installDotnet -Channel 8.0 -i $CLIRoot
27+
& $installDotnet -Channel 9.0 -i $CLIRoot
2728

2829
if (-not (Test-Path $DotnetExe)) {
2930
Write-Log "Missing $DotnetExe"
@@ -72,7 +73,7 @@ Function Install-NuGetExe {
7273
$nugetDir = Split-Path $nugetExe
7374
New-Item -ItemType Directory -Force -Path $nugetDir
7475

75-
Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.9.1/nuget.exe -OutFile $nugetExe
76+
Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.12.1/nuget.exe -OutFile $nugetExe
7677
}
7778
}
7879

‎build/common/common.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ run_standard_tests()
1717
chmod +x .cli/dotnet-install.sh
1818
.cli/dotnet-install.sh -i .cli --channel 6.0
1919
.cli/dotnet-install.sh -i .cli --channel 8.0
20+
.cli/dotnet-install.sh -i .cli --channel 9.0
2021
fi
2122

2223
# Display info

‎build/common/common.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<IsDesktop>true</IsDesktop>
2424
</PropertyGroup>
2525
</When>
26-
<When Condition="$(TargetFramework.Contains('netstandard')) OR $(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('net5')) OR $(TargetFramework.Contains('net6')) OR $(TargetFramework.Contains('net7')) OR $(TargetFramework.Contains('net8'))">
26+
<When Condition="$(TargetFramework.Contains('netstandard')) OR $(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('net5')) OR $(TargetFramework.Contains('net6')) OR $(TargetFramework.Contains('net7')) OR $(TargetFramework.Contains('net8')) OR $(TargetFramework.Contains('net9'))">
2727
<PropertyGroup>
2828
<DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
2929
<IsCore>true</IsCore>
@@ -69,7 +69,7 @@
6969
<PropertyGroup Condition=" '$(PackProject)' == 'true' ">
7070
<IsPackable>true</IsPackable>
7171
<IncludeSymbols Condition=" '$(IncludeSymbols)' == '' AND '$(DebugType)' != 'embedded' ">true</IncludeSymbols>
72-
<SymbolPackageFormat Condition=" '$(IncludeSymbols)' == '' AND '$(DebugType)' != 'embedded' ">snupkg</SymbolPackageFormat>
72+
<SymbolPackageFormat Condition=" '$(IncludeSymbols)' == '' AND '$(DebugType)' != 'embedded' ">snupkg</SymbolPackageFormat>
7373
<PackageOutputPath>$(NupkgOutputDirectory)</PackageOutputPath>
7474
<NoPackageAnalysis>true</NoPackageAnalysis>
7575
</PropertyGroup>
@@ -255,7 +255,7 @@
255255
<ToolEntryPoint Condition=" '$(ToolEntryPoint)' == '' ">$(AssemblyName).dll</ToolEntryPoint>
256256
<ToolOutputPath>$(PublishOutputDirectory)$(TargetFramework)\DotnetToolSettings.xml</ToolOutputPath>
257257
</PropertyGroup>
258-
258+
259259
<!-- Run publish -->
260260
<MSBuild Projects="$(MSBuildProjectFullPath)"
261261
Targets="WriteToolSettingsFile"

‎build/config.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- Dependency versions -->
44
<PropertyGroup>
5-
<NuGetPackageVersion>6.9.1</NuGetPackageVersion>
5+
<NuGetPackageVersion>6.12.1</NuGetPackageVersion>
66
<AzureStorageBlobsVersion>12.20.0</AzureStorageBlobsVersion>
77
<JsonVersion>13.0.3</JsonVersion>
88
<CommandLineUtilsVersion>2.0.0</CommandLineUtilsVersion>

‎src/Sleet/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public static Task<int> MainCore(string[] args, ILogger log)
7676

7777
private static void Configure()
7878
{
79+
#if NET6_0 || NET8_0
7980
// Set connection limit
8081
if (!RuntimeEnvironmentHelper.IsMono)
8182
{
@@ -92,6 +93,7 @@ private static void Configure()
9293
SecurityProtocolType.Tls |
9394
SecurityProtocolType.Tls11 |
9495
SecurityProtocolType.Tls12;
96+
#endif
9597
}
9698
}
9799
}

‎src/Sleet/Sleet.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
77
</PropertyGroup>
88

99
<PropertyGroup Condition=" '$(PackSleetDotnetTool)' == 'true' ">
@@ -61,7 +61,7 @@
6161

6262
<Error Condition=" '$(IsXPlat)' != 'true' AND '$(MergedExePathExists)' != 'true' " Text="Missing $(MergedExePath)" />
6363

64-
<!-- This project packs both the dotnet tool package: Sleet and the exe package: SleetExe.
64+
<!-- This project packs both the dotnet tool package: Sleet and the exe package: SleetExe.
6565
NuGet pack currently rejects dotnet tool packages with desktop framework TFMs, to get
6666
around this we pass PackAsTool=true only during the dotnet tool pack, and exclude the
6767
desktop framework at that time. -->

‎src/SleetLib/SleetLib.csproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\build\common\common.props" />
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44
<PropertyGroup>
5-
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>netstandard2.0;net6.0;net8.0;net9.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<PropertyGroup>
@@ -30,6 +30,13 @@
3030
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
3131
</ItemGroup>
3232

33+
<ItemGroup>
34+
<!-- Vuln fixes -->
35+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
36+
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
37+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
38+
</ItemGroup>
39+
3340
<Import Project="$(BuildCommonDirectory)\common.targets" />
3441
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
3542
</Project>

‎test/Sleet.Integration.Tests/Sleet.Integration.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
77
</PropertyGroup>
8-
8+
99
<PropertyGroup>
1010
<TestProject>true</TestProject>
1111
</PropertyGroup>
12-
12+
1313
<ItemGroup>
1414
<PackageReference Include="NuGet.Protocol" Version="$(NuGetPackageVersion)" />
1515
<PackageReference Include="NuGet.Test.Helpers" Version="$(NuGetTestHelpersVersion)" />
1616
</ItemGroup>
17-
17+
1818
<ItemGroup>
1919
<ProjectReference Include="..\Sleet.Test.Common\Sleet.Test.Common.csproj" />
2020
</ItemGroup>
21-
21+
2222
<Import Project="$(BuildCommonDirectory)\common.targets" />
2323
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
2424
</Project>

‎test/SleetLib.Tests/SleetLib.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net8.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
77
</PropertyGroup>
88

99
<PropertyGroup>
@@ -13,11 +13,11 @@
1313
<ItemGroup>
1414
<EmbeddedResource Include="compiler\resources\**\*" />
1515
</ItemGroup>
16-
16+
1717
<ItemGroup>
1818
<ProjectReference Include="..\Sleet.Test.Common\Sleet.Test.Common.csproj" />
1919
</ItemGroup>
20-
20+
2121
<ItemGroup>
2222
<Folder Include="compiler\resources\" />
2323
</ItemGroup>

0 commit comments

Comments
 (0)