Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update templates to NServiceBus 8 #362

Merged
merged 8 commits into from
May 25, 2023
Merged

Update templates to NServiceBus 8 #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
73c9aac
Update packages
DavidBoike May 22, 2023
87b0213
Remove ScAdapterService - Docs now recommend Bridge instead anyway
DavidBoike May 22, 2023
8068dff
Remove tests for ScAdapter
DavidBoike May 22, 2023
ad60313
Approval tests
DavidBoike May 22, 2023
b12f518
Scrub versions from tests to allow for automated package updates
DavidBoike May 22, 2023
dc8fa3d
Add net7.0 and make default
DavidBoike May 24, 2023
44a0201
Add net7 sdk
DavidBoike May 25, 2023
5a28188
Approval file change due to switch to net7 as default
DavidBoike May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: 6.0.x
dotnet-version: 7.0.x
- name: Build
run: dotnet build src --configuration Release
- name: Upload packages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v3.5.2
with:
fetch-depth: 0
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: 6.0.x
dotnet-version: 7.0.x
- name: Build
run: dotnet build src --configuration Release
- name: Sign NuGet packages
Expand Down
6 changes: 3 additions & 3 deletions src/Templates/NServiceBusDockerContainer/NServiceBusDockerContainer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="NServiceBus" Version="8.0.0-rc.3" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="2.0.0-rc.2" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0-rc.3" />
<PackageReference Include="NServiceBus" Version="8.0.3" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="2.0.0" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 6 additions & 2 deletions src/Templates/NServiceBusWindowsService/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
"description": "The target framework for the project.",
"datatype": "choice",
"choices": [
{
"choice": "net7.0",
"description": "Target net7.0"
},
{
"choice": "net6.0",
"description": "Target net6.0"
Expand All @@ -32,8 +36,8 @@
"description": "Target net472"
}
],
"replaces": "net472",
"defaultValue": "net472"
"replaces": "net7.0",
"defaultValue": "net7.0"
}
}
}
8 changes: 4 additions & 4 deletions src/Templates/NServiceBusWindowsService/NServiceBusWindowsService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
<PackageReference Include="NServiceBus" Version="8.0.0-rc.3" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="2.0.0-rc.2" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0-rc.3" />
<PackageReference Include="NServiceBus" Version="8.0.3" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="2.0.0" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0" />
</ItemGroup>

</Project>
41 changes: 0 additions & 41 deletions src/Templates/ScAdapterService/.template.config/template.json
View file
Open in desktop

This file was deleted.

76 changes: 0 additions & 76 deletions src/Templates/ScAdapterService/AdapterHostedService.cs
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions src/Templates/ScAdapterService/Program.cs
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/Templates/ScAdapterService/ScAdapterService.csproj
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/Tests/ApprovalFiles/TemplateTests.NServiceBusDockerContainer.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ NServiceBusDockerContainer.csproj =>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="NServiceBus" Version="8.0.0-rc.3" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="2.0.0-rc.2" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0-rc.3" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="(VERSION)" />
<PackageReference Include="NServiceBus" Version="(VERSION)" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="(VERSION)" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="(VERSION)" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/Tests/ApprovalFiles/TemplateTests.NServiceBusWindowsService.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ NServiceBusWindowsService.csproj =>

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
<PackageReference Include="NServiceBus" Version="8.0.0-rc.3" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="2.0.0-rc.2" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0-rc.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="(VERSION)" />
<PackageReference Include="NServiceBus" Version="(VERSION)" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="(VERSION)" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="(VERSION)" />
</ItemGroup>

</Project>
Expand Down
8 changes: 4 additions & 4 deletions src/Tests/ApprovalFiles/TemplateTests.NServiceBusWindowsServiceDiffFramework.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ NServiceBusWindowsServiceDiffFramework.csproj =>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
<PackageReference Include="NServiceBus" Version="8.0.0-rc.3" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="2.0.0-rc.2" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0-rc.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="(VERSION)" />
<PackageReference Include="NServiceBus" Version="(VERSION)" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="(VERSION)" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="(VERSION)" />
</ItemGroup>

</Project>
Expand Down
8 changes: 4 additions & 4 deletions src/Tests/ApprovalFiles/TemplateTests.NServiceBusWindowsServiceDotNetCore.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ NServiceBusWindowsServiceDotNetCore.csproj =>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.1" />
<PackageReference Include="NServiceBus" Version="8.0.0-rc.3" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="2.0.0-rc.2" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="3.0.0-rc.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="(VERSION)" />
<PackageReference Include="NServiceBus" Version="(VERSION)" />
<PackageReference Include="NServiceBus.Extensions.Hosting" Version="(VERSION)" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="(VERSION)" />
</ItemGroup>

</Project>
Expand Down