Skip to content

Commit 692290c

Browse files
kristikerkristiker
committed
net core
1 parent 7498575 commit 692290c

4 files changed

Lines changed: 61 additions & 314 deletions

File tree

‎Datamodel.NET.csproj‎

Lines changed: 17 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,26 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{075743A9-B292-410C-B68F-6E6CF588D60A}</ProjectGuid>
3+
<TargetFramework>net6.0-windows</TargetFramework>
94
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
115
<RootNamespace>Datamodel</RootNamespace>
12-
<AssemblyName>Datamodel.NET</AssemblyName>
13-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<TargetFrameworkProfile>
16-
</TargetFrameworkProfile>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7+
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
8+
<UseWPF>true</UseWPF>
179
</PropertyGroup>
1810
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
2611
<DocumentationFile>
2712
</DocumentationFile>
28-
<Prefer32Bit>false</Prefer32Bit>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
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-
<Prefer32Bit>false</Prefer32Bit>
38-
</PropertyGroup>
39-
<PropertyGroup>
40-
<SignAssembly>false</SignAssembly>
4113
</PropertyGroup>
4214
<PropertyGroup>
4315
<AssemblyOriginatorKeyFile>
4416
</AssemblyOriginatorKeyFile>
4517
</PropertyGroup>
4618
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Documentation|AnyCPU'">
4719
<OutputPath>bin\Documentation\</OutputPath>
48-
<DefineConstants>TRACE</DefineConstants>
4920
<Optimize>true</Optimize>
50-
<DebugType>pdbonly</DebugType>
51-
<PlatformTarget>AnyCPU</PlatformTarget>
52-
<ErrorReport>prompt</ErrorReport>
5321
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
5422
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
5523
<DocumentationFile>bin\Documentation\Datamodel.NET.xml</DocumentationFile>
56-
<Prefer32Bit>false</Prefer32Bit>
5724
</PropertyGroup>
5825
<PropertyGroup>
5926
<DelaySign>false</DelaySign>
@@ -62,24 +29,19 @@
6229
<Reference Include="System" />
6330
<Reference Include="System.Drawing" />
6431
<Reference Include="System.Numerics" />
32+
<Compile Remove="DmxPad\**" />
33+
<EmbeddedResource Remove="DmxPad\**" />
34+
<None Remove="DmxPad\**" />
35+
<Page Remove="DmxPad\**" />
36+
</ItemGroup>
37+
<ItemGroup>
38+
<Compile Remove="Tests\Properties\AssemblyInfo.cs" />
39+
<Compile Remove="Tests\Tests.cs" />
6540
</ItemGroup>
6641
<ItemGroup>
67-
<Compile Include="Arrays.cs" />
68-
<Compile Include="Attributes.cs" />
69-
<Compile Include="AttributeList_ICustomTypeDescriptor.cs" />
70-
<Compile Include="Codecs\Binary.cs" />
71-
<Compile Include="Codecs\KeyValues2.cs" />
72-
<Compile Include="Datamodel.cs" />
73-
<Compile Include="Element.cs" />
74-
<Compile Include="ICodec.cs" />
75-
<Compile Include="Properties\AssemblyInfo.cs" />
42+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
43+
<PrivateAssets>all</PrivateAssets>
44+
</PackageReference>
45+
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
7646
</ItemGroup>
77-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
78-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
79-
Other similar extension points exist, see Microsoft.Common.targets.
80-
<Target Name="BeforeBuild">
81-
</Target>
82-
<Target Name="AfterBuild">
83-
</Target>
84-
-->
8547
</Project>

‎Datamodel.NET.sln‎

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.24720.0
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.3.32901.215
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Datamodel.NET", "Datamodel.NET.csproj", "{075743A9-B292-410C-B68F-6E6CF588D60A}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datamodel.NET", "Datamodel.NET.csproj", "{075743A9-B292-410C-B68F-6E6CF588D60A}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}"
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DmxPad", "DmxPad\DmxPad.csproj", "{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}"
1111
EndProject
@@ -28,14 +28,11 @@ Global
2828
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Documentation|Any CPU.Build.0 = Debug|Any CPU
2929
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Release|Any CPU.ActiveCfg = Release|Any CPU
3030
{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Release|Any CPU.Build.0 = Release|Any CPU
31-
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
34-
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Documentation|Any CPU.Build.0 = Debug|Any CPU
35-
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}.Release|Any CPU.Build.0 = Release|Any CPU
3731
EndGlobalSection
3832
GlobalSection(SolutionProperties) = preSolution
3933
HideSolutionNode = FALSE
4034
EndGlobalSection
35+
GlobalSection(ExtensibilityGlobals) = postSolution
36+
SolutionGuid = {FD0D5BA4-8023-4B5D-A487-A0B016BA659F}
37+
EndGlobalSection
4138
EndGlobal

‎DmxPad/DmxPad.csproj‎

Lines changed: 17 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,182 +1,29 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
32
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
3+
<TargetFramework>net6.0-windows</TargetFramework>
54
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{B49BF0E9-46DB-4BE3-9890-02FF5C098C7C}</ProjectGuid>
95
<OutputType>WinExe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>DmxPad</RootNamespace>
12-
<AssemblyName>DmxPad</AssemblyName>
13-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>
15-
</TargetFrameworkProfile>
16-
<FileAlignment>512</FileAlignment>
17-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
18-
<WarningLevel>4</WarningLevel>
19-
</PropertyGroup>
20-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
21-
<DebugSymbols>true</DebugSymbols>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<DebugType>full</DebugType>
25-
<PlatformTarget>AnyCPU</PlatformTarget>
26-
<ErrorReport>prompt</ErrorReport>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7+
<UseWPF>true</UseWPF>
8+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
279
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
28-
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
29-
<Prefer32Bit>false</Prefer32Bit>
30-
</PropertyGroup>
31-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<Optimize>true</Optimize>
35-
<DebugType>pdbonly</DebugType>
36-
<PlatformTarget>AnyCPU</PlatformTarget>
37-
<ErrorReport>prompt</ErrorReport>
38-
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
39-
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
40-
<Prefer32Bit>false</Prefer32Bit>
4110
</PropertyGroup>
4211
<PropertyGroup>
4312
<ApplicationIcon>Resources\dmx.ico</ApplicationIcon>
4413
</PropertyGroup>
4514
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
46-
<DebugSymbols>true</DebugSymbols>
4715
<OutputPath>bin\x86\Debug\</OutputPath>
48-
<DefineConstants>DEBUG;TRACE</DefineConstants>
49-
<DebugType>full</DebugType>
50-
<PlatformTarget>x86</PlatformTarget>
51-
<ErrorReport>prompt</ErrorReport>
5216
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
5317
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
5418
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
55-
<Prefer32Bit>false</Prefer32Bit>
5619
</PropertyGroup>
5720
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
5821
<OutputPath>bin\x86\Release\</OutputPath>
59-
<DefineConstants>TRACE</DefineConstants>
60-
<Optimize>true</Optimize>
61-
<DebugType>pdbonly</DebugType>
62-
<PlatformTarget>x86</PlatformTarget>
63-
<ErrorReport>prompt</ErrorReport>
6422
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
6523
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
6624
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
67-
<Prefer32Bit>false</Prefer32Bit>
6825
</PropertyGroup>
6926
<ItemGroup>
70-
<Reference Include="System" />
71-
<Reference Include="System.Data" />
72-
<Reference Include="System.Drawing" />
73-
<Reference Include="System.Numerics" />
74-
<Reference Include="System.Xml" />
75-
<Reference Include="Microsoft.CSharp" />
76-
<Reference Include="System.Core" />
77-
<Reference Include="System.Xml.Linq" />
78-
<Reference Include="System.Data.DataSetExtensions" />
79-
<Reference Include="System.Xaml">
80-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
81-
</Reference>
82-
<Reference Include="WindowsBase" />
83-
<Reference Include="PresentationCore" />
84-
<Reference Include="PresentationFramework" />
85-
</ItemGroup>
86-
<ItemGroup>
87-
<ApplicationDefinition Include="App.xaml">
88-
<Generator>MSBuild:Compile</Generator>
89-
<SubType>Designer</SubType>
90-
</ApplicationDefinition>
91-
<Compile Include="AttributePanel.xaml.cs">
92-
<DependentUpon>AttributePanel.xaml</DependentUpon>
93-
</Compile>
94-
<Compile Include="ComparisonDatamodel.cs" />
95-
<Compile Include="Controls\LabelledControl.xaml.cs">
96-
<DependentUpon>LabelledControl.xaml</DependentUpon>
97-
</Compile>
98-
<Compile Include="Controls\SearchBox.xaml.cs">
99-
<DependentUpon>SearchBox.xaml</DependentUpon>
100-
</Compile>
101-
<Compile Include="Controls\SelectElement.xaml.cs">
102-
<DependentUpon>SelectElement.xaml</DependentUpon>
103-
</Compile>
104-
<Compile Include="Controls\TreeGrid.cs" />
105-
<Compile Include="Viewmodel.cs" />
106-
<Page Include="AttributePanel.xaml">
107-
<SubType>Designer</SubType>
108-
<Generator>MSBuild:Compile</Generator>
109-
</Page>
110-
<Page Include="Controls\TreeGrid.xaml">
111-
<SubType>Designer</SubType>
112-
<Generator>MSBuild:Compile</Generator>
113-
</Page>
114-
<Page Include="Controls\LabelledControl.xaml">
115-
<SubType>Designer</SubType>
116-
<Generator>MSBuild:Compile</Generator>
117-
</Page>
118-
<Page Include="Controls\SearchBox.xaml">
119-
<Generator>MSBuild:Compile</Generator>
120-
<SubType>Designer</SubType>
121-
</Page>
122-
<Page Include="Controls\SelectElement.xaml">
123-
<SubType>Designer</SubType>
124-
<Generator>MSBuild:Compile</Generator>
125-
</Page>
126-
<DesignDataWithDesignTimeCreatableTypes Include="DesignData.xaml">
127-
<SubType>Designer</SubType>
128-
</DesignDataWithDesignTimeCreatableTypes>
129-
<Page Include="DmxView.xaml">
130-
<SubType>Designer</SubType>
131-
<Generator>MSBuild:Compile</Generator>
132-
</Page>
133-
<Page Include="MainWindow.xaml">
134-
<Generator>MSBuild:Compile</Generator>
135-
<SubType>Designer</SubType>
136-
</Page>
137-
<Compile Include="App.xaml.cs">
138-
<DependentUpon>App.xaml</DependentUpon>
139-
<SubType>Code</SubType>
140-
</Compile>
141-
<Compile Include="Converters.cs" />
142-
<Compile Include="DmxView.xaml.cs">
143-
<DependentUpon>DmxView.xaml</DependentUpon>
144-
</Compile>
145-
<Compile Include="MainWindow.xaml.cs">
146-
<DependentUpon>MainWindow.xaml</DependentUpon>
147-
<SubType>Code</SubType>
148-
</Compile>
149-
<Page Include="Themes\Generic.xaml">
150-
<Generator>MSBuild:Compile</Generator>
151-
<SubType>Designer</SubType>
152-
</Page>
153-
</ItemGroup>
154-
<ItemGroup>
155-
<Compile Include="Properties\AssemblyInfo.cs">
156-
<SubType>Code</SubType>
157-
</Compile>
158-
<Compile Include="Properties\Resources.Designer.cs">
159-
<AutoGen>True</AutoGen>
160-
<DesignTime>True</DesignTime>
161-
<DependentUpon>Resources.resx</DependentUpon>
162-
</Compile>
163-
<Compile Include="Properties\Settings.Designer.cs">
164-
<AutoGen>True</AutoGen>
165-
<DependentUpon>Settings.settings</DependentUpon>
166-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
167-
</Compile>
168-
<EmbeddedResource Include="Properties\Resources.resx">
169-
<Generator>ResXFileCodeGenerator</Generator>
170-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
171-
<SubType>Designer</SubType>
172-
</EmbeddedResource>
173-
<None Include="app.config">
174-
<SubType>Designer</SubType>
175-
</None>
176-
<None Include="Properties\Settings.settings">
177-
<Generator>SettingsSingleFileGenerator</Generator>
178-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
179-
</None>
18027
<AppDesigner Include="Properties\" />
18128
</ItemGroup>
18229
<ItemGroup>
@@ -195,10 +42,7 @@
19542
<Resource Include="Resources\datamodel.png" />
19643
</ItemGroup>
19744
<ItemGroup>
198-
<ProjectReference Include="..\Datamodel.NET.csproj">
199-
<Project>{075743a9-b292-410c-b68f-6e6cf588d60a}</Project>
200-
<Name>Datamodel.NET</Name>
201-
</ProjectReference>
45+
<ProjectReference Include="..\Datamodel.NET.csproj" />
20246
</ItemGroup>
20347
<ItemGroup>
20448
<Resource Include="Resources\dmx.ico" />
@@ -234,12 +78,15 @@
23478
<ItemGroup>
23579
<Resource Include="Resources\Undo.png" />
23680
</ItemGroup>
237-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
238-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
239-
Other similar extension points exist, see Microsoft.Common.targets.
240-
<Target Name="BeforeBuild">
241-
</Target>
242-
<Target Name="AfterBuild">
243-
</Target>
244-
-->
81+
<ItemGroup>
82+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
83+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
84+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
85+
<PrivateAssets>all</PrivateAssets>
86+
</PackageReference>
87+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
88+
</ItemGroup>
89+
<ItemGroup>
90+
<Page Remove="DesignData.xaml" />
91+
</ItemGroup>
24592
</Project>

0 commit comments

Comments
 (0)