Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

<!-- build/scripts -->
<ItemGroup>
<PackageVersion Include="Nullean.Make.Fs" Version="0.28.0" />
<PackageVersion Include="Nullean.Make.Fs" Version="0.30.0" />
<!-- the released package, never the one in src; build/scripts references it directly -->
<PackageVersion Include="Proc.Fs" Version="0.21.0" />
<PackageVersion Include="Proc.Fs" Version="0.22.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions build/scripts/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ let main argv =
for project in projectsToClean () do
sh $"dotnet clean {project} -c Release -v q" }
| Build -> command {
composes [Clean]
executes (shell { sh $"dotnet build -c Release" }) }
composes [Clean] }
|> executes { sh $"dotnet build -c Release" }
// global.json selects Microsoft.Testing.Platform, so this runs the TUnit test executables directly; on GitHub
// Actions TUnit writes its own summary of the run to GITHUB_STEP_SUMMARY
| Test -> target [Build] { sh $"dotnet test -c Release" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/ScratchPad.Fs/ScratchPad.Fs.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/ScratchPad/ScratchPad.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/ScratchPad/TestBinary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private static string GetWorkingDir()

private static string GetDll()
{
var dll = Path.Combine("bin", GetRunningConfiguration(), "net10.0", _procTestBinary + ".dll");
var dll = Path.Combine("bin", GetRunningConfiguration(), "net11.0", _procTestBinary + ".dll");
var fullPath = Path.Combine(GetWorkingDir(), dll);
if (!File.Exists(fullPath))
throw new Exception($"Can not find {fullPath}");
Expand Down
2 changes: 1 addition & 1 deletion src/Proc/Proc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>proc</AssemblyName>
<TargetFrameworks>netstandard2.0;netstandard2.1;net461;net8.0;net10.0;net11.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net461;net10.0;net11.0</TargetFrameworks>
<RootNamespace>ProcNet</RootNamespace>

<SignAssembly>true</SignAssembly>
Expand Down
Loading