Skip to content

Commit 8b13837

Browse files
RomfosRomfos
authored
Configure SourceLink, .snupkg symbols package format & update test projects (castleproject#722)
1 parent 2ecd4ed commit 8b13837

10 files changed

Lines changed: 39 additions & 50 deletions

File tree

‎.github/workflows/build.yml‎

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

1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
# -----
2222
# Setup .NET sdk
2323
# -----
2424

2525
- name: Install .NET SDKs
26-
uses: actions/setup-dotnet@v4
26+
uses: actions/setup-dotnet@v5
2727
with:
2828
dotnet-version: |
2929
8.0.x

‎appveyor.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,6 @@ for:
8686
# upload packages to AppVeyor
8787
artifacts:
8888
- path: build\*.nupkg
89-
name: core
89+
name: library
90+
- path: build\*.snupkg
91+
name: symbols

‎build.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ echo ---------------------------
2727
echo Running NET8.0 Tests
2828
echo ---------------------------
2929

30-
dotnet ./src/Castle.Core.Tests/bin/Release/net8.0/Castle.Core.Tests.dll --result=Net80TestResults.xml;format=nunit3
31-
dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/net8.0/Castle.Core.Tests.WeakNamed.dll --result=Net80WeakNamedTestResults.xml;format=nunit3
32-
30+
dotnet test ./src/Castle.Core.Tests -f net8.0 -c Release --no-build -- NUnit.TestOutputXml="$PWD" NUnit.TestOutputXmlFileName="Net80TestResults"
31+
dotnet test ./src/Castle.Core.Tests.WeakNamed -f net8.0 -c Release --no-build -- NUnit.TestOutputXml="$PWD" NUnit.TestOutputXmlFileName="Net80WeakNamedTestResults"
32+
3333
# Ensure that all test runs produced a protocol file:
3434
if [[ !( -f Net80TestResults.xml &&
3535
-f Net80WeakNamedTestResults.xml ) ]]; then
@@ -48,8 +48,8 @@ echo ---------------------------
4848
echo Running NET9.0 Tests
4949
echo ---------------------------
5050

51-
dotnet ./src/Castle.Core.Tests/bin/Release/net9.0/Castle.Core.Tests.dll --result=Net90TestResults.xml;format=nunit3
52-
dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/net9.0/Castle.Core.Tests.WeakNamed.dll --result=Net90WeakNamedTestResults.xml;format=nunit3
51+
dotnet test ./src/Castle.Core.Tests -f net9.0 -c Release --no-build -- NUnit.TestOutputXml="$PWD" NUnit.TestOutputXmlFileName="Net90TestResults"
52+
dotnet test ./src/Castle.Core.Tests.WeakNamed -f net9.0 -c Release --no-build -- NUnit.TestOutputXml="$PWD" NUnit.TestOutputXmlFileName="Net90WeakNamedTestResults"
5353

5454
# Ensure that all test runs produced a protocol file:
5555
if [[ !( -f Net90TestResults.xml &&

‎buildscripts/build.cmd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ echo --------------------
3737
echo Running NET462 Tests
3838
echo --------------------
3939

40-
src\Castle.Core.Tests\bin\%Configuration%\net462\Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3 || exit /b 1
41-
src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\net462\Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3 || exit /b 1
40+
dotnet test src\Castle.Core.Tests -f net462 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="DesktopClrTestResults" || exit /b 1
41+
dotnet test src\Castle.Core.Tests.WeakNamed -f net462 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="DesktopClrWeakNamedTestResults" || exit /b 1
4242

4343
echo ---------------------------
4444
echo Running NET8.0 Tests
4545
echo ---------------------------
4646

47-
dotnet .\src\Castle.Core.Tests\bin\%Configuration%\net8.0\Castle.Core.Tests.dll --result=Net80TestResults.xml;format=nunit3 || exit /b 1
48-
dotnet .\src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\net8.0/Castle.Core.Tests.WeakNamed.dll --result=Net80WeakNamedTestResults.xml;format=nunit3 || exit /b 1
47+
dotnet test src\Castle.Core.Tests -f net8.0 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="Net80TestResults" || exit /b 1
48+
dotnet test src\Castle.Core.Tests.WeakNamed -f net8.0 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="Net80WeakNamedTestResults" || exit /b 1
4949

5050
echo ---------------------------
5151
echo Running NET9.0 Tests
5252
echo ---------------------------
5353

54-
dotnet .\src\Castle.Core.Tests\bin\%Configuration%\net9.0\Castle.Core.Tests.dll --result=Net90TestResults.xml;format=nunit3 || exit /b 1
55-
dotnet .\src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\net9.0/Castle.Core.Tests.WeakNamed.dll --result=Net90WeakNamedTestResults.xml;format=nunit3 || exit /b 1
54+
dotnet test src\Castle.Core.Tests -f net9.0 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="Net90TestResults" || exit /b 1
55+
dotnet test src\Castle.Core.Tests.WeakNamed -f net9.0 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="Net90WeakNamedTestResults" || exit /b 1

‎buildscripts/common.props‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<PropertyGroup>
44
<LangVersion>14.0</LangVersion>
55
<NoWarn>$(NoWarn);CS1591;CS3014;CS3003;CS3001;CS3021</NoWarn>
6-
<NoWarn>$(NoWarn);CS0612;CS0618</NoWarn> <!-- TODO: Remove this line once `[Obsolete]` members have been dealt with. -->
6+
<NoWarn>$(NoWarn);CS0612;CS0618</NoWarn>
7+
<!-- TODO: Remove this line once `[Obsolete]` members have been dealt with. -->
78
<RepositoryType>git</RepositoryType>
89
<RepositoryUrl>https://github.com/castleproject/Core</RepositoryUrl>
910
<BuildVersion>0.0.0</BuildVersion>
@@ -32,6 +33,14 @@
3233
<ContentTargetFolders>.</ContentTargetFolders>
3334
</PropertyGroup>
3435

36+
<PropertyGroup Condition="'$(CI)' == 'True'">
37+
<!--Deterministic Build and Source Link settings -->
38+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
39+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
40+
<IncludeSymbols>true</IncludeSymbols>
41+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
42+
</PropertyGroup>
43+
3544
<ItemGroup>
3645
<Content Include="..\..\CHANGELOG.md" />
3746
<Content Include="..\..\LICENSE" Pack="True" PackagePath="" />

‎src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,25 @@
77
</PropertyGroup>
88

99
<PropertyGroup>
10-
<OutputType>Exe</OutputType>
1110
<Authors>Castle Contributors</Authors>
1211
<AssemblyName>Castle.Core.Tests.WeakNamed</AssemblyName>
1312
<RootNamespace>Castle</RootNamespace>
1413
<Version>0.0.0.0</Version>
1514
<AssemblyVersion>0.0.0.0</AssemblyVersion>
1615
<SignAssembly>False</SignAssembly>
1716
<PublicSign Condition="'$(OS)'=='Unix'">false</PublicSign>
18-
<StartupObject>Program</StartupObject>
17+
<IsPackable>false</IsPackable>
1918
</PropertyGroup>
2019

2120
<ItemGroup>
2221
<Compile Include="..\Castle.Core\DynamicProxy\Generators\Emitters\StrongNameUtil.cs" Link="DynamicProxy.Tests\StrongNameUtil.cs" />
2322
</ItemGroup>
24-
23+
24+
<ItemGroup>
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
26+
<PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
27+
</ItemGroup>
28+
2529
<ItemGroup>
2630
<ProjectReference Include="..\Castle.Core\Castle.Core.csproj" />
2731
<ProjectReference Include="..\Castle.Core.Tests\Castle.Core.Tests.csproj" />

‎src/Castle.Core.Tests.WeakNamed/Program.cs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/Castle.Core.Tests/Castle.Core.Tests.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
</PropertyGroup>
88

99
<PropertyGroup>
10-
<OutputType>Exe</OutputType>
1110
<Authors>Castle Contributors</Authors>
1211
<AssemblyName>Castle.Core.Tests</AssemblyName>
1312
<RootNamespace>Castle</RootNamespace>
@@ -16,7 +15,7 @@
1615
<SignAssembly>True</SignAssembly>
1716
<AssemblyOriginatorKeyFile>..\..\buildscripts\CastleKey.snk</AssemblyOriginatorKeyFile>
1817
<PublicSign Condition="'$(OS)'=='Unix'">true</PublicSign>
19-
<StartupObject>Program</StartupObject>
18+
<IsPackable>false</IsPackable>
2019
</PropertyGroup>
2120

2221
<ItemGroup Condition="'$([MSBuild]::GetTargetFrameworkIdentifier(&quot;$(TargetFramework)&quot;))' == '.NETFramework'">
@@ -42,9 +41,9 @@
4241
</ItemGroup>
4342

4443
<ItemGroup>
45-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
46-
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
47-
<PackageReference Include="NUnitLite" Version="3.14.0" />
44+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
45+
<PackageReference Include="NUnit3TestAdapter" Version="6.0.1" />
46+
<PackageReference Include="NUnit" Version="3.14.0" />
4847
<PackageReference Include="Serilog.Sinks.TextWriter" Version="2.1.0" />
4948
</ItemGroup>
5049

@@ -59,7 +58,7 @@
5958
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' ">
6059
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.2" />
6160
<PackageReference Include="System.Security.Permissions" Version="8.0.0" />
62-
<PackageReference Include="PublicApiGenerator" Version="11.4.6" />
61+
<PackageReference Include="PublicApiGenerator" Version="11.5.4" />
6362
</ItemGroup>
6463

6564
</Project>

‎src/Castle.Core.Tests/Program.cs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎tools/Explicit.NuGet.Versions/Program.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ private static void WriteNuspecToPackages(Dictionary<string, NuspecContentEntry>
3939
{
4040
using (var zipFile = ZipFile.Open(packageFile.Key, ZipArchiveMode.Update))
4141
{
42+
zipFile.GetEntry(packageFile.Value.EntryName).Delete();
4243
using (var stream = new StreamWriter(zipFile.CreateEntry(packageFile.Value.EntryName).Open()))
4344
{
4445
stream.Write(packageFile.Value.Contents);

0 commit comments

Comments
 (0)