Skip to content

Commit

Permalink
Update to latest runtime (#101)
Browse files Browse the repository at this point in the history
- Bump runtime library to version that integrates the ghūl MSBuild targets
- Bump compiler tool to latest
- Use Directory.Packages.props for central package version management
- Switch to a single Dependabot config across the main project and the two test projects

Bumps #minor version
  • Loading branch information
degory committed Feb 9, 2024
1 parent dd08ed5 commit 95b442a
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"ghul.compiler": {
"version": "0.7.0",
"version": "0.7.1",
"commands": [
"ghul-compiler"
]
Expand Down
12 changes: 10 additions & 2 deletions .dependabot/ghul-test.csproj
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<!--
Ensure Dependabot is triggered for this repository as
it doesn't recognize .ghulproj as a valid project file
-->

<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../ghul-test.ghulproj" />
</Project>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
</Project>
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ updates:
directory: ".dependabot/"
schedule:
interval: "daily"
- package-ecosystem: "nuget"
directory: "tests/.dependabot/"
schedule:
interval: "daily"
allow:
- dependency-type: "all"
ignore:
- dependency-name: "ghul.compiler"
7 changes: 3 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<Project>
<PropertyGroup>
<Version>1.1.4-alpha.41</Version>
<Version>1.2.1-alpha.1</Version>
<NoWarn>$(NoWarn);NU1507</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ghul.targets" Version="1.2.*" />
<PackageReference Include="ghul.pipes" Version="1.1.*" />
<PackageReference Include="ghul.runtime" Version="1.2.*" />
<PackageReference Include="ghul.runtime" />
</ItemGroup>
</Project>
22 changes: 22 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project>
<ItemGroup>
<!-- ghūl runtime -->
<PackageVersion Include="ghul.runtime" Version="1.3.0" />

<!-- ghūl compiler dependencies -->
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="8.0.0" />
<PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="8.0.0" />
<PackageVersion Include="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="8.0.0" />

<!-- unit test dependencies -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageVersion Include="MSTest.TestFramework" Version="3.2.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="NSubstitute" Version="5.1.0" />

<!-- common dependencies -->
<PackageVersion Include="System.IO.Abstractions" Version="20.0.15" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions ghul-test.ghulproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

<Title>ghūl test</Title>
<PackageDescription>ghūl compiler snapshot test runner</PackageDescription>
Expand Down
3 changes: 0 additions & 3 deletions tests/.dependabot/tests.csproj

This file was deleted.

12 changes: 7 additions & 5 deletions tests/tests.ghulproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
<DebugType>None</DebugType>
<GhulCompiler>dotnet ghul-compiler</GhulCompiler>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>

<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="FluentAssertions" />
<PackageReference Include="NSubstitute" />

<ProjectReference Include="../ghul-test.ghulproj" />

Expand Down

0 comments on commit 95b442a

Please sign in to comment.