Skip to content

Commit

Permalink
Update pr workflow (#11)
Browse files Browse the repository at this point in the history
* Add formatting to PR workflow

* Update line endings

* Change to UTF-8 for csproj files

* Add gitattributes

* Update gitattributes

* Update pull_request.yml
  • Loading branch information
mihaitabamburic authored Mar 29, 2022
1 parent 77fa5a3 commit 0347618
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ root = true
[*]
insert_final_newline = true

[*.{xml,config}]
[*.{xml,config,csproj}]
charset=utf-8
end_of_line=crlf
insert_final_newline=true
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
15 changes: 13 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,28 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- name: Set line endings
run: git config --global core.eol crlf

- name: Checkout repo
uses: actions/checkout@v3

- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: "3.1.x"
dotnet-version: 6.0.x

- name: Restore dependencies
working-directory: src
run: dotnet restore

- name: Check formatting
working-directory: src
run: dotnet format --no-restore --verify-no-changes

- name: Build solution
working-directory: src
run: dotnet build
run: dotnet build --no-restore

- name: Run tests
working-directory: src
Expand Down
42 changes: 21 additions & 21 deletions src/Rebus.Datadog.Tracing.Tests/Rebus.Datadog.Tracing.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="Rebus" Version="5.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="Moq" Version="4.17.2" />
<PackageReference Include="Rebus" Version="5.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Rebus.Datadog.Tracing\Rebus.Datadog.Tracing.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Rebus.Datadog.Tracing\Rebus.Datadog.Tracing.csproj" />
</ItemGroup>

</Project>
26 changes: 13 additions & 13 deletions src/Rebus.Datadog.Tracing/Rebus.Datadog.Tracing.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>Visma E-conomic</Authors>
<Company>Visma</Company>
<Description>This package contains 2 Rebus steps. One step to be used in the producer to populate the Rebus message header and the second one to be used in the Consumer to fetch those headers and create a trace that link with the one in the producer, this way having a distributed tracing across microservice.</Description>
<PackageProjectUrl>https://github.com/e-conomic/Rebus.Datadog.Tracing</PackageProjectUrl>
<RepositoryUrl>https://github.com/e-conomic/Rebus.Datadog.Tracing</RepositoryUrl>
<PackageTags>Rebus Datadog Tracing</PackageTags>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Authors>Visma E-conomic</Authors>
<Company>Visma</Company>
<Description>This package contains 2 Rebus steps. One step to be used in the producer to populate the Rebus message header and the second one to be used in the Consumer to fetch those headers and create a trace that link with the one in the producer, this way having a distributed tracing across microservice.</Description>
<PackageProjectUrl>https://github.com/e-conomic/Rebus.Datadog.Tracing</PackageProjectUrl>
<RepositoryUrl>https://github.com/e-conomic/Rebus.Datadog.Tracing</RepositoryUrl>
<PackageTags>Rebus Datadog Tracing</PackageTags>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="2.2.0" />
<PackageReference Include="Rebus" Version="5.1.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="2.2.0" />
<PackageReference Include="Rebus" Version="5.1.0" />
</ItemGroup>

</Project>

0 comments on commit 0347618

Please sign in to comment.