Skip to content

Commit 71f4f4b

Browse files
tngraftngraf
committed
feat: convert demo application to .Net 6
1 parent 22e7f42 commit 71f4f4b

12 files changed

+95
-418
lines changed

‎Fossology.Rest.Dotnet.sln

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29503.13
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.33205.214
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{66961846-D78E-4DC0-BE09-F712FC21EA09}"
77
ProjectSection(SolutionItems) = preProject
@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fossology.Rest.Dotnet", "Fo
2525
EndProject
2626
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fossology.Rest.Dotnet.Test", "Fossology.Rest.Dotnet.Test\Fossology.Rest.Dotnet.Test.csproj", "{A1FBAA6A-4B91-4889-93C5-0346E2474162}"
2727
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FossyApiDemo", "FossyApiDemo\FossyApiDemo.csproj", "{CAF41CCA-2778-4767-AB50-60205339E60B}"
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FossyApiDemo", "FossyApiDemo\FossyApiDemo.csproj", "{A3CA5288-F717-48E5-A6F7-76E93D9F9108}"
2929
EndProject
3030
Global
3131
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,10 +45,10 @@ Global
4545
{A1FBAA6A-4B91-4889-93C5-0346E2474162}.Debug|Any CPU.Build.0 = Debug|Any CPU
4646
{A1FBAA6A-4B91-4889-93C5-0346E2474162}.Release|Any CPU.ActiveCfg = Release|Any CPU
4747
{A1FBAA6A-4B91-4889-93C5-0346E2474162}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{CAF41CCA-2778-4767-AB50-60205339E60B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{CAF41CCA-2778-4767-AB50-60205339E60B}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{CAF41CCA-2778-4767-AB50-60205339E60B}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{CAF41CCA-2778-4767-AB50-60205339E60B}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{A3CA5288-F717-48E5-A6F7-76E93D9F9108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{A3CA5288-F717-48E5-A6F7-76E93D9F9108}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{A3CA5288-F717-48E5-A6F7-76E93D9F9108}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{A3CA5288-F717-48E5-A6F7-76E93D9F9108}.Release|Any CPU.Build.0 = Release|Any CPU
5252
EndGlobalSection
5353
GlobalSection(SolutionProperties) = preSolution
5454
HideSolutionNode = FALSE

‎FossyApiDemo/App.config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎FossyApiDemo/FossyApiDemo.csproj

Lines changed: 25 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{CAF41CCA-2778-4767-AB50-60205339E60B}</ProjectGuid>
8-
<OutputType>WinExe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>FossyApiDemo</RootNamespace>
11-
<AssemblyName>FossyApiDemo</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<TargetFrameworkProfile />
16-
<StyleCopTreatErrorsAsWarnings>True</StyleCopTreatErrorsAsWarnings>
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<CodeAnalysisRuleSet>FossyApiDemo.ruleset</CodeAnalysisRuleSet>
28-
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<PlatformTarget>AnyCPU</PlatformTarget>
31-
<DebugType>pdbonly</DebugType>
32-
<Optimize>true</Optimize>
33-
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
37-
<CodeAnalysisRuleSet>FossyApiDemo.ruleset</CodeAnalysisRuleSet>
38-
</PropertyGroup>
39-
<ItemGroup>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Drawing" />
43-
<Reference Include="System.Net.Http" />
44-
<Reference Include="System.Windows.Forms" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<Compile Include="..\GlobalAssemblyInfo.cs">
48-
<Link>Properties\GlobalAssemblyInfo.cs</Link>
49-
</Compile>
50-
<Compile Include="MainForm.cs">
51-
<SubType>Form</SubType>
52-
</Compile>
53-
<Compile Include="MainForm.Designer.cs">
54-
<DependentUpon>MainForm.cs</DependentUpon>
55-
</Compile>
56-
<Compile Include="Program.cs" />
57-
<Compile Include="Properties\AssemblyInfo.cs" />
58-
<EmbeddedResource Include="MainForm.resx">
59-
<DependentUpon>MainForm.cs</DependentUpon>
60-
</EmbeddedResource>
61-
<EmbeddedResource Include="Properties\Resources.resx">
62-
<Generator>ResXFileCodeGenerator</Generator>
63-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
64-
<SubType>Designer</SubType>
65-
</EmbeddedResource>
66-
<Compile Include="Properties\Resources.Designer.cs">
67-
<AutoGen>True</AutoGen>
68-
<DependentUpon>Resources.resx</DependentUpon>
69-
<DesignTime>True</DesignTime>
70-
</Compile>
71-
<None Include="FossyApiDemo.ruleset" />
72-
<None Include="Properties\Settings.settings">
73-
<Generator>SettingsSingleFileGenerator</Generator>
74-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
75-
</None>
76-
<Compile Include="Properties\Settings.Designer.cs">
77-
<AutoGen>True</AutoGen>
78-
<DependentUpon>Settings.settings</DependentUpon>
79-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
80-
</Compile>
81-
</ItemGroup>
82-
<ItemGroup>
83-
<None Include="App.config" />
84-
</ItemGroup>
85-
<ItemGroup>
86-
<ProjectReference Include="..\Fossology.Rest.Dotnet.Model\Fossology.Rest.Dotnet.Model.csproj">
87-
<Project>{396e05c3-9ad3-4d1b-8e0b-8c24c6c490eb}</Project>
88-
<Name>Fossology.Rest.Dotnet.Model</Name>
89-
</ProjectReference>
90-
<ProjectReference Include="..\FOSSology.REST.dotnet\FOSSology.REST.dotnet.csproj">
91-
<Project>{510a1d9e-c531-4a0e-a516-6aa0125e4f9b}</Project>
92-
<Name>Fossology.Rest.Dotnet</Name>
93-
</ProjectReference>
94-
<ProjectReference Include="..\FOSSology.REST.dotnet.Model\FOSSology.REST.dotnet.Model.csproj">
95-
<Project>{396e05c3-9ad3-4d1b-8e0b-8c24c6c490eb}</Project>
96-
<Name>Fossology.Rest.Dotnet</Name>
97-
</ProjectReference>
98-
</ItemGroup>
99-
<ItemGroup>
100-
<PackageReference Include="StyleCop.Analyzers">
101-
<Version>1.1.118</Version>
102-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
103-
<PrivateAssets>all</PrivateAssets>
104-
</PackageReference>
105-
<PackageReference Include="Tethys.Logging.Controls">
106-
<Version>1.6.1</Version>
107-
</PackageReference>
108-
</ItemGroup>
109-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
110-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
111-
Other similar extension points exist, see Microsoft.Common.targets.
112-
<Target Name="BeforeBuild">
113-
</Target>
114-
<Target Name="AfterBuild">
115-
</Target>
116-
-->
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net6.0-windows</TargetFramework>
6+
<Nullable>disable</Nullable>
7+
<UseWindowsForms>true</UseWindowsForms>
8+
<ImplicitUsings>disable</ImplicitUsings>
9+
<CodeAnalysisRuleSet>FossyApiDemo.ruleset</CodeAnalysisRuleSet>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="Tethys.Logging" Version="1.6.1" />
18+
<PackageReference Include="Tethys.Logging.Controls.NET5" Version="1.6.1" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\Fossology.Rest.Dotnet.Model\Fossology.Rest.Dotnet.Model.csproj" />
23+
<ProjectReference Include="..\Fossology.Rest.Dotnet\Fossology.Rest.Dotnet.csproj" />
24+
</ItemGroup>
25+
11726
</Project>

‎FossyApiDemo/MainForm.Designer.cs

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)