Skip to content
Open
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: 4 additions & 4 deletions Hosuto.sln
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hosuto.SimpleInjector.Tests", "test\Hosuto.SimpleInjector.Tests\Hosuto.SimpleInjector.Tests.csproj", "{B16EA0A4-8EBE-4EAC-ACE9-538572951747}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet50", "dotnet50", "{F03A55C6-AB61-4A07-8E06-A742A1E9F625}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{F03A55C6-AB61-4A07-8E06-A742A1E9F625}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebModule", "samples\dotnet50\SampleWebModule\SampleWebModule.csproj", "{1C6AD780-6DC3-4AF1-AB4E-51ABC1FC3A75}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebModule", "samples\dotnet\SampleWebModule\SampleWebModule.csproj", "{1C6AD780-6DC3-4AF1-AB4E-51ABC1FC3A75}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "samples\dotnet50\App\App.csproj", "{1BFA0E1B-556C-49DA-81F0-1067FAD97458}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "samples\dotnet\App\App.csproj", "{1BFA0E1B-556C-49DA-81F0-1067FAD97458}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorLibrary", "samples\dotnet50\RazorLibrary\RazorLibrary.csproj", "{71E30ED2-53D6-4A9D-B541-4255D88E97AD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorLibrary", "samples\dotnet\RazorLibrary\RazorLibrary.csproj", "{71E30ED2-53D6-4A9D-B541-4255D88E97AD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
8 changes: 6 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ variables:
buildConfiguration: 'Release'

steps:
- task: UseGitVersion@5
- task: gitversion/setup@3.1.11
displayName: Install GitVersion
inputs:
versionSpec: '5.x'
versionSpec: '5.11.x'

- task: gitversion/execute@3.1.11
displayName: Execute GitVersion

- task: DotNetCoreCLI@2
inputs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Dbosoft.Hosuto.Samples.App</AssemblyName>
<RootNamespace>Dbosoft.Hosuto.Sample</RootNamespace>
<IsPackable>false</IsPackable>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
<PublishUrl>bin\Release\net8.0\publish\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<RootNamespace>Dbosoft.Hosuto.Sample</RootNamespace>
<AssemblyName>Dbosoft.Hosuto.Samples.WebModule</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion src/Hosuto.Abstractions/Hosuto.Abstractions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net6.0</TargetFrameworks>
<AssemblyName>Dbosoft.Hosuto.Hosting.AspNetCore</AssemblyName>
<RootNamespace>Dbosoft.Hosuto</RootNamespace>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
</PropertyGroup>

<Import Project="..\..\build\pack.props" />

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

Expand All @@ -32,7 +32,7 @@


<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Dbosoft.Hosuto.Modules.Hosting
{
public static class ModulesHostBuilderExtensions
{
#if NETCOREAPP || NET50
#if NETCOREAPP

public static IModulesHostBuilder ConfigureWebHostDefaults(this IModulesHostBuilder builder, Action<Microsoft.AspNetCore.Hosting.IWebHostBuilder> configure)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Hosuto.Hosting/Hosuto.Hosting.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions src/Hosuto.SimpleInjector/Hosuto.SimpleInjector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<Import Project="..\..\build\pack.props" />

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SimpleInjector" Version="4.6" />
<PackageReference Include="SimpleInjector.Integration.GenericHost" Version="4.6" />
<PackageReference Include="SimpleInjector.Integration.ServiceCollection" Version="4.6" />
<PackageReference Include="SimpleInjector" Version="5.5.0" />
<PackageReference Include="SimpleInjector.Integration.GenericHost" Version="5.5.0" />
<PackageReference Include="SimpleInjector.Integration.ServiceCollection" Version="5.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/Hosuto.Testing.AspNetCore/Hosuto.Testing.AspNetCore.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;netstandard2.0;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.0;netstandard2.0;net6.0;net8.0</TargetFrameworks>
<AssemblyName>Dbosoft.Hosuto.Testing.AspNetCore</AssemblyName>
<RootNamespace>Dbosoft.Hosuto</RootNamespace>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
Expand All @@ -15,10 +15,10 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
Expand All @@ -41,7 +41,7 @@


<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/Hosuto/Hosuto.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Import Project="..\..\build\pack.props" />

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.6.9">
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<CheckEolTargetFramework>false</CheckEolTargetFramework>

Expand Down
2 changes: 1 addition & 1 deletion test/Hosuto.Hosting.Tests/Hosuto.Hosting.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down