Skip to content
Snippets Groups Projects
Commit 3585bc80 authored by L. Ellenbeck's avatar L. Ellenbeck
Browse files

Merge branch 'Issue/1910-MigrationtoNET6.0' into 'dev' 

Update: Migrated to .NET6.0 (coscine/issues#1910)

See merge request !26
parents 174f6af1 26ecf559
Branches
Tags
2 merge requests!27Release: Sprint/2022 06 :robot:,!26Update: Migrated to .NET6.0 (coscine/issues#1910)
Show whitespace changes
Inline Side-by-side
src/Configuration.Tests/Configuration.Tests.csproj
+ 4
− 4
View file @ 3585bc80
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>Coscine.Configuration.Tests</RootNamespace> <RootNamespace>Coscine.Configuration.Tests</RootNamespace>
<AssemblyName>Coscine.Configuration.Tests</AssemblyName> <AssemblyName>Coscine.Configuration.Tests</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks> <TargetFrameworks>net6.0;net461</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\configuration\Configuration.csproj" /> <ProjectReference Include="..\configuration\Configuration.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NUnit" Version="3.13.1" /> <PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" /> <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
src/Configuration.sln
+ 2
− 2
View file @ 3585bc80
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.29009.5 VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Configuration", "configuration\Configuration.csproj", "{97FC4A08-A089-4823-9AEB-D05B36BE931D}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Configuration", "configuration\Configuration.csproj", "{97FC4A08-A089-4823-9AEB-D05B36BE931D}"
EndProject EndProject
......
src/Configuration/Configuration.csproj
+ 2
− 2
View file @ 3585bc80
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>Coscine.Configuration</RootNamespace> <RootNamespace>Coscine.Configuration</RootNamespace>
<AssemblyName>Coscine.Configuration</AssemblyName> <AssemblyName>Coscine.Configuration</AssemblyName>
<TargetFrameworks>net5.0;net461</TargetFrameworks> <TargetFrameworks>net6.0;net461</TargetFrameworks>
<Version>2.0.0</Version> <Version>2.0.0</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
...@@ -23,6 +23,6 @@ ...@@ -23,6 +23,6 @@
<None Include="Coscine.Configuration.Key.snk" /> <None Include="Coscine.Configuration.Key.snk" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Consul" Version="1.6.1.1" /> <PackageReference Include="Consul" Version="1.6.10.4" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment