diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef401c0e0..a692f242d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,14 +16,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 # ----- # Setup .NET sdk # ----- - name: Install .NET SDKs - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 8.0.x diff --git a/appveyor.yml b/appveyor.yml index 78946484b..a9a39ed10 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -86,4 +86,6 @@ for: # upload packages to AppVeyor artifacts: - path: build\*.nupkg - name: core + name: library + - path: build\*.snupkg + name: symbols \ No newline at end of file diff --git a/build.sh b/build.sh index b150065e8..a091126b7 100755 --- a/build.sh +++ b/build.sh @@ -27,9 +27,9 @@ echo --------------------------- echo Running NET8.0 Tests echo --------------------------- -dotnet ./src/Castle.Core.Tests/bin/Release/net8.0/Castle.Core.Tests.dll --result=Net80TestResults.xml;format=nunit3 -dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/net8.0/Castle.Core.Tests.WeakNamed.dll --result=Net80WeakNamedTestResults.xml;format=nunit3 - +dotnet test ./src/Castle.Core.Tests -f net8.0 -c Release --no-build -- NUnit.TestOutputXml="$PWD" NUnit.TestOutputXmlFileName="Net80TestResults" +dotnet test ./src/Castle.Core.Tests.WeakNamed -f net8.0 -c Release --no-build -- NUnit.TestOutputXml="$PWD" NUnit.TestOutputXmlFileName="Net80WeakNamedTestResults" + # Ensure that all test runs produced a protocol file: if [[ !( -f Net80TestResults.xml && -f Net80WeakNamedTestResults.xml ) ]]; then @@ -48,8 +48,8 @@ echo --------------------------- echo Running NET9.0 Tests echo --------------------------- -dotnet ./src/Castle.Core.Tests/bin/Release/net9.0/Castle.Core.Tests.dll --result=Net90TestResults.xml;format=nunit3 -dotnet ./src/Castle.Core.Tests.WeakNamed/bin/Release/net9.0/Castle.Core.Tests.WeakNamed.dll --result=Net90WeakNamedTestResults.xml;format=nunit3 +dotnet test ./src/Castle.Core.Tests -f net9.0 -c Release --no-build -- NUnit.TestOutputXml="$PWD" NUnit.TestOutputXmlFileName="Net90TestResults" +dotnet test ./src/Castle.Core.Tests.WeakNamed -f net9.0 -c Release --no-build -- NUnit.TestOutputXml="$PWD" NUnit.TestOutputXmlFileName="Net90WeakNamedTestResults" # Ensure that all test runs produced a protocol file: if [[ !( -f Net90TestResults.xml && diff --git a/buildscripts/build.cmd b/buildscripts/build.cmd index 7fc46e1ba..38dd05230 100644 --- a/buildscripts/build.cmd +++ b/buildscripts/build.cmd @@ -37,19 +37,19 @@ echo -------------------- echo Running NET462 Tests echo -------------------- -src\Castle.Core.Tests\bin\%Configuration%\net462\Castle.Core.Tests.exe --result=DesktopClrTestResults.xml;format=nunit3 || exit /b 1 -src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\net462\Castle.Core.Tests.WeakNamed.exe --result=DesktopClrWeakNamedTestResults.xml;format=nunit3 || exit /b 1 +dotnet test src\Castle.Core.Tests -f net462 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="DesktopClrTestResults" || exit /b 1 +dotnet test src\Castle.Core.Tests.WeakNamed -f net462 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="DesktopClrWeakNamedTestResults" || exit /b 1 echo --------------------------- echo Running NET8.0 Tests echo --------------------------- -dotnet .\src\Castle.Core.Tests\bin\%Configuration%\net8.0\Castle.Core.Tests.dll --result=Net80TestResults.xml;format=nunit3 || exit /b 1 -dotnet .\src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\net8.0/Castle.Core.Tests.WeakNamed.dll --result=Net80WeakNamedTestResults.xml;format=nunit3 || exit /b 1 +dotnet test src\Castle.Core.Tests -f net8.0 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="Net80TestResults" || exit /b 1 +dotnet test src\Castle.Core.Tests.WeakNamed -f net8.0 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="Net80WeakNamedTestResults" || exit /b 1 echo --------------------------- echo Running NET9.0 Tests echo --------------------------- -dotnet .\src\Castle.Core.Tests\bin\%Configuration%\net9.0\Castle.Core.Tests.dll --result=Net90TestResults.xml;format=nunit3 || exit /b 1 -dotnet .\src\Castle.Core.Tests.WeakNamed\bin\%Configuration%\net9.0/Castle.Core.Tests.WeakNamed.dll --result=Net90WeakNamedTestResults.xml;format=nunit3 || exit /b 1 +dotnet test src\Castle.Core.Tests -f net9.0 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="Net90TestResults" || exit /b 1 +dotnet test src\Castle.Core.Tests.WeakNamed -f net9.0 -c %Configuration% --no-build -- NUnit.TestOutputXml="%CD%" NUnit.TestOutputXmlFileName="Net90WeakNamedTestResults" || exit /b 1 \ No newline at end of file diff --git a/buildscripts/common.props b/buildscripts/common.props index b2989c095..0630c0c8e 100644 --- a/buildscripts/common.props +++ b/buildscripts/common.props @@ -3,7 +3,8 @@ 14.0 $(NoWarn);CS1591;CS3014;CS3003;CS3001;CS3021 - $(NoWarn);CS0612;CS0618 + $(NoWarn);CS0612;CS0618 + git https://github.com/castleproject/Core 0.0.0 @@ -32,6 +33,14 @@ . + + + true + true + true + snupkg + + diff --git a/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj index 2fa68818c..b8aebd5da 100644 --- a/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj +++ b/src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj @@ -7,7 +7,6 @@ - Exe Castle Contributors Castle.Core.Tests.WeakNamed Castle @@ -15,13 +14,18 @@ 0.0.0.0 False false - Program + false - + + + + + + diff --git a/src/Castle.Core.Tests.WeakNamed/Program.cs b/src/Castle.Core.Tests.WeakNamed/Program.cs deleted file mode 100644 index a5dbb5a2a..000000000 --- a/src/Castle.Core.Tests.WeakNamed/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Reflection; -using NUnit.Common; -using NUnitLite; - -internal class Program -{ - public static int Main(string[] args) - { - return new AutoRun(typeof(Program).Assembly) - .Execute(args, new ExtendedTextWrapper(Console.Out), Console.In); - } -} \ No newline at end of file diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj index e95c87714..4da516139 100644 --- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj +++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj @@ -7,7 +7,6 @@ - Exe Castle Contributors Castle.Core.Tests Castle @@ -16,7 +15,7 @@ True ..\..\buildscripts\CastleKey.snk true - Program + false @@ -42,9 +41,9 @@ - - - + + + @@ -59,7 +58,7 @@ - + \ No newline at end of file diff --git a/src/Castle.Core.Tests/Program.cs b/src/Castle.Core.Tests/Program.cs deleted file mode 100644 index a5dbb5a2a..000000000 --- a/src/Castle.Core.Tests/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Reflection; -using NUnit.Common; -using NUnitLite; - -internal class Program -{ - public static int Main(string[] args) - { - return new AutoRun(typeof(Program).Assembly) - .Execute(args, new ExtendedTextWrapper(Console.Out), Console.In); - } -} \ No newline at end of file diff --git a/tools/Explicit.NuGet.Versions/Program.cs b/tools/Explicit.NuGet.Versions/Program.cs index a68345cc5..9e9e7eabb 100644 --- a/tools/Explicit.NuGet.Versions/Program.cs +++ b/tools/Explicit.NuGet.Versions/Program.cs @@ -39,6 +39,7 @@ private static void WriteNuspecToPackages(Dictionary { using (var zipFile = ZipFile.Open(packageFile.Key, ZipArchiveMode.Update)) { + zipFile.GetEntry(packageFile.Value.EntryName).Delete(); using (var stream = new StreamWriter(zipFile.CreateEntry(packageFile.Value.EntryName).Open())) { stream.Write(packageFile.Value.Contents);