Skip to content

Commit 34f3ad5

Browse files
NikolayPianikovNikolayPianikov
committed
Update to 2.1.38
1 parent 8eb53df commit 34f3ad5

File tree

13 files changed

+156
-10
lines changed

13 files changed

+156
-10
lines changed

‎.github/workflows/main.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Build
2+
3+
on: [ push, pull_request ]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v4
12+
13+
- name: Setup dotnet
14+
uses: actions/setup-dotnet@v3
15+
with:
16+
dotnet-version: '9.0.x'
17+
18+
- name: Build
19+
run: dotnet run --project ./Build

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
_ReSharper.Caches/
1111
.idea
1212
.logs
13+
.packages

‎.run/App.run.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="App" type="DotNetProject" factoryName=".NET Project">
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/App/bin/Debug/net8.0/App.exe" />
4+
<option name="PROGRAM_PARAMETERS" value="" />
5+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/App/bin/Debug/net8.0" />
6+
<option name="PASS_PARENT_ENVS" value="1" />
7+
<option name="USE_EXTERNAL_CONSOLE" value="0" />
8+
<option name="USE_MONO" value="0" />
9+
<option name="RUNTIME_ARGUMENTS" value="" />
10+
<option name="PROJECT_PATH" value="$PROJECT_DIR$/App/App.csproj" />
11+
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
12+
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
13+
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
14+
<option name="PROJECT_KIND" value="DotNetCore" />
15+
<option name="PROJECT_TFM" value="net8.0" />
16+
<method v="2">
17+
<option name="Build" />
18+
</method>
19+
</configuration>
20+
</component>

‎.run/Build.run.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Build" type="DotNetProject" factoryName=".NET Project">
3+
<option name="EXE_PATH" value="$PROJECT_DIR$/Build/bin/Debug/net9.0/Build.exe" />
4+
<option name="PROGRAM_PARAMETERS" value="" />
5+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
6+
<option name="PASS_PARENT_ENVS" value="1" />
7+
<option name="USE_EXTERNAL_CONSOLE" value="0" />
8+
<option name="USE_MONO" value="0" />
9+
<option name="RUNTIME_ARGUMENTS" value="" />
10+
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Build/Build.csproj" />
11+
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
12+
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
13+
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
14+
<option name="PROJECT_KIND" value="DotNetCore" />
15+
<option name="PROJECT_TFM" value="net9.0" />
16+
<method v="2">
17+
<option name="Build" />
18+
</method>
19+
</configuration>
20+
</component>

‎App/App.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Pure.DI" Version="2.1.36">
11+
<PackageReference Include="Pure.DI" Version="2.1.38">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>

‎Build/Build.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="CSharpInteractive" Version="[1.1.5, 1.2.0)" />
11+
</ItemGroup>
12+
13+
</Project>

‎Build/Program.cs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using HostApi;
2+
3+
new DotNetPack()
4+
.WithProject("Lib")
5+
.WithOutput(".packages")
6+
.WithWorkingDirectory(".")
7+
.Build().EnsureSuccess();
8+
9+
new DotNetRestore()
10+
.WithSources(".packages", "https://api.nuget.org/v3/index.json")
11+
.WithNoCache(true)
12+
.WithForce(true)
13+
.Build().EnsureSuccess();
14+
15+
new DotNetBuild()
16+
.WithNoRestore(true)
17+
.Build().EnsureSuccess();
18+
19+
new DotNetTest()
20+
.WithNoBuild(true)
21+
.Build().EnsureSuccess();
22+
23+
new DotNetRun()
24+
.WithProject("App")
25+
.WithNoBuild(true)
26+
.Run(timeout: TimeSpan.FromMilliseconds(500));
27+
28+
new DotNetRun()
29+
.WithProject("PackageRefApp")
30+
.WithNoBuild(true)
31+
.Run(timeout: TimeSpan.FromMilliseconds(500));

‎Build/Program.csx

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// To run the script:
2+
// - Install "dotnet-csi" as a tool using the "dotnet tool" command, for example:
3+
// dotnet tool install dotnet-csi -g
4+
// - Run this script from the working directory
5+
// containing the solution or project to be built, for example:
6+
// dotnet csi ./build/Program.csx
7+
8+
// To change the logging level (Quiet, Normal or Diagnostic):
9+
// #l Diagnostic
10+
11+
// To add a reference to the NuGet package:
12+
// #r "nuget: MyPackage, 1.2.3"
13+
14+
// To add an assembly reference:
15+
// #r "MyAssembly.dll"
16+
17+
// To include code from the file
18+
// in the order in which it should be executed:
19+
// #load "MyClass.cs"
20+
21+
// More information can be found on the page:
22+
// https://github.com/DevTeam/csharp-interactive
23+
24+
#load "Program.cs"

‎Build/README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
This projects contains the script *__Program.csx__*. To run this script from the command line:
2+
3+
```shell
4+
dotnet csi Program.csx
5+
```
6+
7+
To run as a .NET console application:
8+
9+
```shell
10+
dotnet run
11+
```

‎Lib.Tests/Lib.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -12,13 +12,13 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15-
<PackageReference Include="xunit" Version="2.9.0" />
15+
<PackageReference Include="xunit" Version="2.9.2" />
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
20-
<PackageReference Include="Moq" Version="4.20.71" />
21-
<PackageReference Include="Pure.DI" Version="2.1.36">
20+
<PackageReference Include="Moq" Version="4.20.72" />
21+
<PackageReference Include="Pure.DI" Version="2.1.38">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>

0 commit comments

Comments
 (0)