Skip to content

Commit c32580d

Browse files
author
ComputerElite
committed
migrate to .NET 6
1 parent 77b8c72 commit c32580d

File tree

2 files changed

+103
-67
lines changed

2 files changed

+103
-67
lines changed

‎ComputerAnalytics.csproj

+12-67
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{B4B8C578-D5AE-4415-832A-C84D07BE4679}</ProjectGuid>
3+
<TargetFramework>net6.0</TargetFramework>
84
<OutputType>Exe</OutputType>
9-
<RootNamespace>ComputerAnalytics</RootNamespace>
10-
<AssemblyName>ComputerAnalytics</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
5+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
346
</PropertyGroup>
357
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
38-
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
39-
</Reference>
40-
<Reference Include="System.Core" />
41-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
42-
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
43-
</Reference>
44-
<Reference Include="System.Numerics" />
45-
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46-
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
47-
</Reference>
48-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
49-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
50-
</Reference>
518
<Reference Include="System.Text.Json, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
52-
<Reference Include="System.Xml.Linq" />
53-
<Reference Include="System.Data.DataSetExtensions" />
54-
<Reference Include="Microsoft.CSharp" />
55-
<Reference Include="System.Data" />
56-
<Reference Include="System.Net.Http" />
57-
<Reference Include="System.Xml" />
58-
</ItemGroup>
59-
<ItemGroup>
60-
<Compile Include="AnalyticsConstants.cs" />
61-
<Compile Include="Authentication.cs" />
62-
<Compile Include="Program.cs" />
63-
<Compile Include="Properties\AssemblyInfo.cs" />
649
</ItemGroup>
6510
<ItemGroup>
66-
<None Include="App.config" />
67-
<None Include="packages.config" />
68-
</ItemGroup>
69-
<ItemGroup>
70-
<ProjectReference Include="..\..\ComputerUtils\ComputerUtils\ComputerUtils.csproj">
71-
<Project>{f4a6aa3f-d1b6-42b4-9183-ca3f2d75c7df}</Project>
72-
<Name>ComputerUtils</Name>
73-
</ProjectReference>
11+
<ProjectReference Include="..\..\ComputerUtils\ComputerUtils\ComputerUtils.csproj" />
7412
</ItemGroup>
7513
<ItemGroup>
7614
<EmbeddedResource Include="plotly.js" />
@@ -87,5 +25,12 @@
8725
<ItemGroup>
8826
<EmbeddedResource Include="manage.html" />
8927
</ItemGroup>
90-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
28+
<ItemGroup>
29+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
30+
<PackageReference Include="System.Buffers" Version="4.5.1" />
31+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
32+
<PackageReference Include="System.Memory" Version="4.5.4" />
33+
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
34+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
35+
</ItemGroup>
9136
</Project>

‎ComputerAnalytics.csproj.old

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" 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>{B4B8C578-D5AE-4415-832A-C84D07BE4679}</ProjectGuid>
8+
<OutputType>Exe</OutputType>
9+
<RootNamespace>ComputerAnalytics</RootNamespace>
10+
<AssemblyName>ComputerAnalytics</AssemblyName>
11+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12+
<FileAlignment>512</FileAlignment>
13+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14+
<Deterministic>true</Deterministic>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<PlatformTarget>AnyCPU</PlatformTarget>
18+
<DebugSymbols>true</DebugSymbols>
19+
<DebugType>full</DebugType>
20+
<Optimize>false</Optimize>
21+
<OutputPath>bin\Debug\</OutputPath>
22+
<DefineConstants>DEBUG;TRACE</DefineConstants>
23+
<ErrorReport>prompt</ErrorReport>
24+
<WarningLevel>4</WarningLevel>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<PlatformTarget>AnyCPU</PlatformTarget>
28+
<DebugType>pdbonly</DebugType>
29+
<Optimize>true</Optimize>
30+
<OutputPath>bin\Release\</OutputPath>
31+
<DefineConstants>TRACE</DefineConstants>
32+
<ErrorReport>prompt</ErrorReport>
33+
<WarningLevel>4</WarningLevel>
34+
</PropertyGroup>
35+
<ItemGroup>
36+
<Reference Include="System" />
37+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
38+
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
39+
</Reference>
40+
<Reference Include="System.Core" />
41+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
42+
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
43+
</Reference>
44+
<Reference Include="System.Numerics" />
45+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46+
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
47+
</Reference>
48+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
49+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
50+
</Reference>
51+
<Reference Include="System.Text.Json, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
52+
<Reference Include="System.Xml.Linq" />
53+
<Reference Include="System.Data.DataSetExtensions" />
54+
<Reference Include="Microsoft.CSharp" />
55+
<Reference Include="System.Data" />
56+
<Reference Include="System.Net.Http" />
57+
<Reference Include="System.Xml" />
58+
</ItemGroup>
59+
<ItemGroup>
60+
<Compile Include="AnalyticsConstants.cs" />
61+
<Compile Include="Authentication.cs" />
62+
<Compile Include="Program.cs" />
63+
<Compile Include="Properties\AssemblyInfo.cs" />
64+
</ItemGroup>
65+
<ItemGroup>
66+
<None Include="App.config" />
67+
<None Include="packages.config" />
68+
</ItemGroup>
69+
<ItemGroup>
70+
<ProjectReference Include="..\..\ComputerUtils\ComputerUtils\ComputerUtils.csproj">
71+
<Project>{f4a6aa3f-d1b6-42b4-9183-ca3f2d75c7df}</Project>
72+
<Name>ComputerUtils</Name>
73+
</ProjectReference>
74+
</ItemGroup>
75+
<ItemGroup>
76+
<EmbeddedResource Include="plotly.js" />
77+
</ItemGroup>
78+
<ItemGroup>
79+
<EmbeddedResource Include="analytics.js" />
80+
</ItemGroup>
81+
<ItemGroup>
82+
<EmbeddedResource Include="analytics.html" />
83+
</ItemGroup>
84+
<ItemGroup>
85+
<EmbeddedResource Include="login.html" />
86+
</ItemGroup>
87+
<ItemGroup>
88+
<EmbeddedResource Include="manage.html" />
89+
</ItemGroup>
90+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91+
</Project>

0 commit comments

Comments
 (0)