Skip to content

Commit

Permalink
Merge branch 'release/Indori' into develop/github/consume-latest-nuget
Browse files Browse the repository at this point in the history
# Conflicts:
#	Directory.Packages.props
  • Loading branch information
SteveGilham committed Nov 14, 2024
2 parents 4fcadb5 + abb5ba8 commit 947725f
Show file tree
Hide file tree
Showing 182 changed files with 1,628 additions and 1,103 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-reportgenerator-globaltool": {
"version": "5.3.8",
"version": "5.4.0",
"commands": [
"reportgenerator"
],
Expand Down Expand Up @@ -38,7 +38,7 @@
"rollForward": false
},
"nbgv": {
"version": "3.6.141",
"version": "3.6.146",
"commands": [
"nbgv"
],
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.400'
dotnet-version: '9.0.100'
- name: Tools
run: dotnet tool restore
- name: Setup
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.400'
dotnet-version: '9.0.100'
- name: Tools
run: dotnet tool restore
- name: Setup
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,7 @@ InternalTrace.*.log
nunit-agent_*.log
$*/
*.orig
ThirdParty/BlackFox.CommandLine.8.dll
ThirdParty/BlackFox.CommandLine.il
ThirdParty/FSharpOptimizationData.BlackFox.CommandLine
ThirdParty/FSharpSignatureData.BlackFox.CommandLine
18 changes: 1 addition & 17 deletions AltCover.Api.Tests/AltCover.Api.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net472</TargetFrameworks>
<TargetFrameworks>net9.0;net472</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>AltCover.Api.Tests</AssemblyName>
<GenerateProgramFile>false</GenerateProgramFile>
Expand Down Expand Up @@ -74,22 +74,6 @@
<PackageReference Include="FSharp.Core">
<ExcludeAssets>contentfiles</ExcludeAssets>
</PackageReference>
<PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
<Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
<HintPath>..\ThirdParty\Unquote.dll</HintPath>
</Reference>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion AltCover.Avalonia/AltCover.Avalonia.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>AltCover.Visualizer</RootNamespace>
<AssemblyName>AltCover.Visualizer</AssemblyName>
<PackAsTool>True</PackAsTool>
Expand Down
6 changes: 3 additions & 3 deletions AltCover.Avalonia/AltCover.Avalonia11.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>AltCover.Visualizer</RootNamespace>
<AssemblyName>AltCover.Visualizer</AssemblyName>
<PackAsTool>True</PackAsTool>
Expand All @@ -28,10 +28,10 @@
<AvaloniaResource Include="AltCover.App11.xaml">
<LogicalName>AltCover.App.xaml</LogicalName>
</AvaloniaResource>

<AvaloniaResource Include="AltCover.AboutBox.xaml">
<LogicalName>AltCover.AboutBox.xaml</LogicalName>
</AvaloniaResource>
</AvaloniaResource>
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 15 additions & 3 deletions AltCover.Avalonia/MainWindow.fs
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ type MainWindow() as this =
let ofd = OpenFileDialog()
#endif

// fsharplint:disable-next-line RedundantNewKeyword
let iconMaker (x: Stream) = new Bitmap(x)

[<NonSerialized>]
Expand Down Expand Up @@ -841,7 +842,11 @@ type MainWindow() as this =
"exit" ]
|> Seq.iter (fun n ->
let cap =
n.First().ToString().ToUpper() + n.Substring(1)
n
.First()
.ToString()
.ToUpper(CultureInfo.InvariantCulture)
+ n.Substring(1)

let raw =
Resource.GetResourceString(n + "Button.Label")
Expand Down Expand Up @@ -1091,8 +1096,9 @@ type MainWindow() as this =
t.Text <- String.Empty
// clear format stashes -- TODO
#if !AVALONIA11
t.FormattedText.Spans <- []
t.Tag <- t.FormattedText.Spans
let ft = t.FormattedText
ft.Spans <- []
t.Tag <- ft.Spans
#endif
)

Expand Down Expand Up @@ -1159,4 +1165,10 @@ type MainWindow() as this =
Target = "AltCover.MainWindow",
Justification = "God Object, alas")>]
#endif
[<assembly: SuppressMessage("Gendarme.Rules.Smells",
"AvoidSwitchStatementsRule",
Scope = "member", // MethodDefinition
Target =
"AltCover.MainWindow/tagByCoverage@423::Invoke(Avalonia.Controls.Presenters.TextPresenter,Microsoft.FSharp.Collections.FSharpList`1<Avalonia.Media.FormattedTextLine>,AltCover.GuiCommon/CodeTag)",
Justification = "Wrong paradigm")>]
()
1 change: 1 addition & 0 deletions AltCover.Avalonia/Persistence.fs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace AltCover

open System
open System.Diagnostics.CodeAnalysis

open Avalonia
open Avalonia.Controls
Expand Down
8 changes: 3 additions & 5 deletions AltCover.Cake/AltCover.Cake.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RootNamespace>AltCover.Cake</RootNamespace>
<AssemblyName>AltCover.Cake</AssemblyName>
Expand All @@ -27,10 +27,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Cake.Common" Condition="'$(TargetFramework)' == 'netstandard2.0'" VersionOverride="1.0.0" />
<PackageReference Include="Cake.Common" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" VersionOverride="2.0.0" />
<PackageReference Include="Cake.Core" Condition="'$(TargetFramework)' == 'netstandard2.0'" VersionOverride="1.0.0" />
<PackageReference Include="Cake.Core" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" VersionOverride="2.0.0" />
<PackageReference Include="Cake.Common" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Cake.Core" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
114 changes: 114 additions & 0 deletions AltCover.Cake/CakeMix.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
using System;
using System.ComponentModel;
using System.Collections.Generic;

#if NETSTANDARD2_1

#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member

namespace Cake.Core
{
[EditorBrowsable(EditorBrowsableState.Never)]
public interface ICakeContext
{
Cake.Core.Diagnostics.ICakeLog Log { get; }
}
}

namespace Cake.Core.Diagnostics
{
[EditorBrowsable(EditorBrowsableState.Never)]
public interface ICakeLog
{
void Write(Verbosity v, LogLevel l, string format);
}

[EditorBrowsable(EditorBrowsableState.Never)]
public enum Verbosity
{
Normal,
Verbose
}

[EditorBrowsable(EditorBrowsableState.Never)]
public enum LogLevel
{
Information,
Error,
Warning,
Verbose
}
}

namespace Cake.Core.IO
{
[EditorBrowsable(EditorBrowsableState.Never)]
public class ProcessArgumentBuilder
{
public void Append(string s)
{ }

public void Append(IProcessArgument s)
{ }

public IEnumerable<IProcessArgument> Skip(int n)
{ return null; }

public IEnumerable<IProcessArgument> Take(int n)
{ return null; }
}

[EditorBrowsable(EditorBrowsableState.Never)]
public interface IProcessArgument
{ }

[EditorBrowsable(EditorBrowsableState.Never)]
public class FilePath
{
public FilePath GetFilename()
{ return null; }

public string FullPath
{ get { return String.Empty; } }
}
}

namespace Cake.Core.Annotations
{
[EditorBrowsable(EditorBrowsableState.Never)]
[AttributeUsage(AttributeTargets.Method)]
public class CakeMethodAliasAttribute : Attribute
{ }

[EditorBrowsable(EditorBrowsableState.Never)]
[AttributeUsage(AttributeTargets.All)]
public class CakeAliasCategoryAttribute : Attribute
{
public CakeAliasCategoryAttribute(string s)
{ }
}
}

namespace Cake.Common.Tools.DotNet
{
[EditorBrowsable(EditorBrowsableState.Never)]
public static class DotNetAliases
{
public static void DotNetTest(
Cake.Core.ICakeContext context,
string fullPath,
Cake.Common.Tools.DotNet.Test.DotNetTestSettings testSettings)
{ }
}
}

namespace Cake.Common.Tools.DotNet.Test
{
[EditorBrowsable(EditorBrowsableState.Never)]
public class DotNetTestSettings
{
public Func<Cake.Core.IO.ProcessArgumentBuilder, Cake.Core.IO.ProcessArgumentBuilder> ArgumentCustomization { get; set; }
}
}

#endif
Loading

0 comments on commit 947725f

Please sign in to comment.