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
8 changes: 6 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0
fetch-tags: true
- name: Install .Net Core
uses: actions/[email protected]
with:
dotnet-version: 8.0.201
dotnet-version: 8.0.406
- name: Install dotnet-script
run: dotnet tool install dotnet-script --global

Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "cecil"]
path = cecil
url = https://github.com/jbevain/cecil.git
44 changes: 29 additions & 15 deletions DbReader.sln
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30114.105
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EEFE241F-68CC-4C49-86B1-C7DA81F24250}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D7BAB27-2679-4825-BCAC-506DE94B09BC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader", "src\DbReader\DbReader.csproj", "{99BF0316-D315-4E01-8F79-9EA45782F07B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader", "src\DbReader\DbReader.csproj", "{750224E1-F07A-4F85-AF4A-A58896AE800F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader.Tests", "src\DbReader.Tests\DbReader.Tests.csproj", "{328B68A5-9A0F-40BC-9181-B4922894BFF0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader.Tests", "src\DbReader.Tests\DbReader.Tests.csproj", "{C7D0AF4F-6CF0-4D86-8F71-167557A205A5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader.Tracking", "src\DbReader.Tracking\DbReader.Tracking.csproj", "{E1B757E5-F9CD-49AB-AE23-364BEB752711}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbReader.Tracking.SampleAssembly", "src\DbReader.Tracking.SampleAssembly\DbReader.Tracking.SampleAssembly.csproj", "{AF516499-8AE8-4C37-B7D4-444D4C8066DF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -18,17 +22,27 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{99BF0316-D315-4E01-8F79-9EA45782F07B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{99BF0316-D315-4E01-8F79-9EA45782F07B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99BF0316-D315-4E01-8F79-9EA45782F07B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{99BF0316-D315-4E01-8F79-9EA45782F07B}.Release|Any CPU.Build.0 = Release|Any CPU
{328B68A5-9A0F-40BC-9181-B4922894BFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{328B68A5-9A0F-40BC-9181-B4922894BFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{328B68A5-9A0F-40BC-9181-B4922894BFF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{328B68A5-9A0F-40BC-9181-B4922894BFF0}.Release|Any CPU.Build.0 = Release|Any CPU
{750224E1-F07A-4F85-AF4A-A58896AE800F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{750224E1-F07A-4F85-AF4A-A58896AE800F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{750224E1-F07A-4F85-AF4A-A58896AE800F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{750224E1-F07A-4F85-AF4A-A58896AE800F}.Release|Any CPU.Build.0 = Release|Any CPU
{C7D0AF4F-6CF0-4D86-8F71-167557A205A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C7D0AF4F-6CF0-4D86-8F71-167557A205A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C7D0AF4F-6CF0-4D86-8F71-167557A205A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C7D0AF4F-6CF0-4D86-8F71-167557A205A5}.Release|Any CPU.Build.0 = Release|Any CPU
{E1B757E5-F9CD-49AB-AE23-364BEB752711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1B757E5-F9CD-49AB-AE23-364BEB752711}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1B757E5-F9CD-49AB-AE23-364BEB752711}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E1B757E5-F9CD-49AB-AE23-364BEB752711}.Release|Any CPU.Build.0 = Release|Any CPU
{AF516499-8AE8-4C37-B7D4-444D4C8066DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF516499-8AE8-4C37-B7D4-444D4C8066DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF516499-8AE8-4C37-B7D4-444D4C8066DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF516499-8AE8-4C37-B7D4-444D4C8066DF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{99BF0316-D315-4E01-8F79-9EA45782F07B} = {EEFE241F-68CC-4C49-86B1-C7DA81F24250}
{328B68A5-9A0F-40BC-9181-B4922894BFF0} = {EEFE241F-68CC-4C49-86B1-C7DA81F24250}
{750224E1-F07A-4F85-AF4A-A58896AE800F} = {7D7BAB27-2679-4825-BCAC-506DE94B09BC}
{C7D0AF4F-6CF0-4D86-8F71-167557A205A5} = {7D7BAB27-2679-4825-BCAC-506DE94B09BC}
{E1B757E5-F9CD-49AB-AE23-364BEB752711} = {7D7BAB27-2679-4825-BCAC-506DE94B09BC}
{AF516499-8AE8-4C37-B7D4-444D4C8066DF} = {7D7BAB27-2679-4825-BCAC-506DE94B09BC}
EndGlobalSection
EndGlobal
21 changes: 16 additions & 5 deletions build/build.csx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#load "nuget:Dotnet.Build, 0.16.0"
#load "nuget:Dotnet.Build, 0.24.0"
#load "nuget:dotnet-steps, 0.0.2"

BuildContext.CodeCoverageThreshold = 90;
Console.WriteLine($"Building with the latest tag {BuildContext.LatestTag}");

BuildContext.CodeCoverageThreshold = 87;

[StepDescription("Runs the tests with test coverage")]
Step testcoverage = () => DotNet.TestWithCodeCoverage();
Expand All @@ -10,21 +12,30 @@ Step testcoverage = () => DotNet.TestWithCodeCoverage();
Step test = () => DotNet.Test();

[StepDescription("Creates the NuGet packages")]
Step pack = () =>
AsyncStep pack = async () =>
{
test();
testcoverage();
testcoverage(); ;
DotNet.Pack();
await buildTrackingPackage();
};

[DefaultStep]
[StepDescription("Deploys packages if we are on a tag commit in a secure environment.")]
AsyncStep deploy = async () =>
{
pack();
await pack();
await Artifacts.Deploy();
};

AsyncStep buildTrackingPackage = async () =>
{
var workingDirectory = Path.Combine(BuildContext.SourceFolder, "DbReader.Tracking");
await Command.ExecuteAsync("dotnet", $"pack /p:NuspecFile=DbReader.Tracking.nuspec /p:IsPackable=true /p:NuspecProperties=version={BuildContext.LatestTag} -o ../../build/Artifacts/NuGet", workingDirectory);

};


await StepRunner.Execute(Args);
return 0;

1 change: 1 addition & 0 deletions cecil
Submodule cecil added at 5de7d8
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "8.0.406",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion omnisharp.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
},
"script": {
"enableScriptNuGetReferences": true,
"defaultTargetFramework": "net7.0"
"defaultTargetFramework": "net8.0"
}
}
Loading
Loading