Skip to content

Commit 58d696a

Browse files
committed
Add support for slnx. Switch to net9.0
1 parent 6a47dd9 commit 58d696a

Some content is hidden

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

41 files changed

+2659
-52
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
2222

23-
- name: Install .NET 8.0
24-
uses: actions/setup-dotnet@v3
23+
- name: Install .NET 9.0
24+
uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: '8.0.x'
26+
dotnet-version: '9.0.x'
2727

2828
- name: Build and Test (Debug)
2929
run: dotnet test src -c Debug
@@ -32,4 +32,4 @@ jobs:
3232
if: github.event_name == 'push'
3333
shell: bash
3434
run: |
35-
./src/dotnet-releaser/bin/Debug/net8.0/dotnet-releaser run --nuget-token "${{secrets.NUGET_TOKEN}}" --github-token "${{secrets.GITHUB_TOKEN}}" src/dotnet-releaser.toml
35+
./src/dotnet-releaser/bin/Debug/net9.0/dotnet-releaser run --nuget-token "${{secrets.NUGET_TOKEN}}" --github-token "${{secrets.GITHUB_TOKEN}}" src/dotnet-releaser.toml

src/DotNetReleaser.Tests/BasicTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public async Task TestBuildService()
251251
if (OperatingSystem.IsWindows())
252252
{
253253
var wrap = await CliWrap.Cli.Wrap("wsl")
254-
.WithArguments(new string[] { "-d", "Ubuntu-20.04", "--", "dpkg", "-x", Path.GetFileName(debArchive), "./tmp" }, true)
254+
.WithArguments(new string[] { "--", "dpkg", "-x", Path.GetFileName(debArchive), "./tmp" }, true)
255255
.WithWorkingDirectory(_artifactsFolder)
256256
.ExecuteAsync();
257257
}
@@ -298,7 +298,7 @@ public async Task TestBuildService()
298298
if (OperatingSystem.IsWindows())
299299
{
300300
var wrap = await CliWrap.Cli.Wrap("wsl")
301-
.WithArguments(new string[] { "-d", "Ubuntu-20.04", "--", "dpkg", "--info", Path.GetFileName(debArchive)}, true)
301+
.WithArguments(new string[] { "--", "dpkg", "--info", Path.GetFileName(debArchive)}, true)
302302
.WithWorkingDirectory(_artifactsFolder)
303303
.WithStandardOutputPipe(PipeTarget.ToStringBuilder(packageInfoOutput))
304304
.ExecuteAsync();

src/DotNetReleaser.Tests/DotNetReleaser.Tests.csproj

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
@@ -21,15 +21,23 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
25-
<PackageReference Include="NUnit" Version="3.13.3" />
26-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
27-
<PackageReference Include="coverlet.collector" Version="6.0.0">
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
25+
<PackageReference Include="NUnit" Version="4.3.2" />
26+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
27+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>
3131
</ItemGroup>
3232

33+
<ItemGroup>
34+
<Using Include="NUnit.Framework" />
35+
<Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
36+
<Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
37+
<Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
38+
<Using Include="NUnit.Framework.Legacy.DirectoryAssert" Alias="DirectoryAssert" />
39+
<Using Include="NUnit.Framework.Legacy.FileAssert" Alias="FileAssert" />
40+
</ItemGroup>
3341

3442
<ItemGroup>
3543
<ProjectReference Include="..\dotnet-releaser\dotnet-releaser.csproj" />
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System.IO.Pipes;
2+
3+
namespace MsBuildPipeLogger
4+
{
5+
public class AnonymousPipeWriter : PipeWriter
6+
{
7+
public string Handle { get; }
8+
9+
public AnonymousPipeWriter(string pipeHandleAsString)
10+
: base(new AnonymousPipeClientStream(PipeDirection.Out, pipeHandleAsString))
11+
{
12+
Handle = pipeHandleAsString;
13+
}
14+
}
15+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
namespace Microsoft.Build.Logging
2+
{
3+
public enum BinaryLogRecordKind
4+
{
5+
EndOfFile = 0,
6+
BuildStarted,
7+
BuildFinished,
8+
ProjectStarted,
9+
ProjectFinished,
10+
TargetStarted,
11+
TargetFinished,
12+
TaskStarted,
13+
TaskFinished,
14+
Error,
15+
Warning,
16+
Message,
17+
TaskCommandLine,
18+
CriticalBuildMessage,
19+
ProjectEvaluationStarted,
20+
ProjectEvaluationFinished,
21+
ProjectImported,
22+
ProjectImportArchive,
23+
TargetSkipped
24+
}
25+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
using System;
2+
3+
namespace Microsoft.Build.Logging
4+
{
5+
/// <summary>
6+
/// A bitmask to specify which fields on a BuildEventArgs object are present; used in serialization.
7+
/// </summary>
8+
[Flags]
9+
internal enum BuildEventArgsFieldFlags
10+
{
11+
None = 0,
12+
BuildEventContext = 1 << 0,
13+
HelpHeyword = 1 << 1,
14+
Message = 1 << 2,
15+
SenderName = 1 << 3,
16+
ThreadId = 1 << 4,
17+
Timestamp = 1 << 5,
18+
Subcategory = 1 << 6,
19+
Code = 1 << 7,
20+
File = 1 << 8,
21+
ProjectFile = 1 << 9,
22+
LineNumber = 1 << 10,
23+
ColumnNumber = 1 << 11,
24+
EndLineNumber = 1 << 12,
25+
EndColumnNumber = 1 << 13
26+
}
27+
}

0 commit comments

Comments
 (0)