Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit d316575

Browse files
maxijabasemaxijabase
committed
Update CondenserTest project to .NET 7
1 parent 91cd67b commit d316575

File tree

4 files changed

+66
-190
lines changed

4 files changed

+66
-190
lines changed

‎SourcepawnCondenser/CondenserTest/CondenserTest.csproj‎

Lines changed: 8 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,28 @@
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')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{B1E03089-FD98-4C01-828F-8CB05F87462F}</ProjectGuid>
3+
<TargetFramework>net7.0-windows</TargetFramework>
84
<OutputType>WinExe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>CondenserTest</RootNamespace>
11-
<AssemblyName>CondenserTest</AssemblyName>
12-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
135
<LangVersion>latest</LangVersion>
14-
<FileAlignment>512</FileAlignment>
15-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
16-
<WarningLevel>4</WarningLevel>
17-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
18-
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<PlatformTarget>AnyCPU</PlatformTarget>
21-
<DebugSymbols>true</DebugSymbols>
22-
<DebugType>full</DebugType>
23-
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
25-
<DefineConstants>DEBUG;TRACE</DefineConstants>
26-
<ErrorReport>prompt</ErrorReport>
27-
<WarningLevel>4</WarningLevel>
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>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7+
<UseWPF>true</UseWPF>
8+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
379
</PropertyGroup>
3810
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-Beta|AnyCPU'">
3911
<DebugSymbols>true</DebugSymbols>
4012
<OutputPath>bin\Debug-Beta\</OutputPath>
41-
<DefineConstants>DEBUG;TRACE</DefineConstants>
42-
<DebugType>full</DebugType>
43-
<PlatformTarget>AnyCPU</PlatformTarget>
44-
<LangVersion>7.3</LangVersion>
45-
<ErrorReport>prompt</ErrorReport>
46-
<Prefer32Bit>true</Prefer32Bit>
4713
</PropertyGroup>
4814
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-Beta|AnyCPU'">
4915
<OutputPath>bin\Release-Beta\</OutputPath>
50-
<DefineConstants>TRACE</DefineConstants>
5116
<Optimize>true</Optimize>
52-
<DebugType>pdbonly</DebugType>
53-
<PlatformTarget>AnyCPU</PlatformTarget>
54-
<LangVersion>7.3</LangVersion>
55-
<ErrorReport>prompt</ErrorReport>
56-
<Prefer32Bit>true</Prefer32Bit>
5717
</PropertyGroup>
5818
<ItemGroup>
59-
<Reference Include="System" />
60-
<Reference Include="System.Data" />
61-
<Reference Include="System.Xml" />
62-
<Reference Include="Microsoft.CSharp" />
63-
<Reference Include="System.Core" />
64-
<Reference Include="System.Xml.Linq" />
65-
<Reference Include="System.Data.DataSetExtensions" />
66-
<Reference Include="System.Net.Http" />
67-
<Reference Include="System.Xaml">
68-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
69-
</Reference>
70-
<Reference Include="WindowsBase" />
71-
<Reference Include="PresentationCore" />
72-
<Reference Include="PresentationFramework" />
73-
</ItemGroup>
74-
<ItemGroup>
75-
<ApplicationDefinition Include="App.xaml">
76-
<Generator>MSBuild:Compile</Generator>
77-
<SubType>Designer</SubType>
78-
</ApplicationDefinition>
79-
<Page Include="MainWindow.xaml">
80-
<Generator>MSBuild:Compile</Generator>
81-
<SubType>Designer</SubType>
82-
</Page>
83-
<Compile Include="App.xaml.cs">
84-
<DependentUpon>App.xaml</DependentUpon>
85-
<SubType>Code</SubType>
86-
</Compile>
87-
<Compile Include="MainWindow.xaml.cs">
88-
<DependentUpon>MainWindow.xaml</DependentUpon>
89-
<SubType>Code</SubType>
90-
</Compile>
91-
</ItemGroup>
92-
<ItemGroup>
93-
<Compile Include="Properties\AssemblyInfo.cs">
94-
<SubType>Code</SubType>
95-
</Compile>
96-
<Compile Include="Properties\Resources.Designer.cs">
97-
<AutoGen>True</AutoGen>
98-
<DesignTime>True</DesignTime>
99-
<DependentUpon>Resources.resx</DependentUpon>
100-
</Compile>
101-
<Compile Include="Properties\Settings.Designer.cs">
102-
<AutoGen>True</AutoGen>
103-
<DependentUpon>Settings.settings</DependentUpon>
104-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
105-
</Compile>
106-
<EmbeddedResource Include="Properties\Resources.resx">
107-
<Generator>ResXFileCodeGenerator</Generator>
108-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
109-
</EmbeddedResource>
110-
<None Include="Properties\Settings.settings">
111-
<Generator>SettingsSingleFileGenerator</Generator>
112-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
113-
</None>
11419
<AppDesigner Include="Properties\" />
11520
</ItemGroup>
11621
<ItemGroup>
117-
<None Include="App.config" />
22+
<ProjectReference Include="..\SourcepawnCondenser\SourcepawnCondenser.csproj" />
11823
</ItemGroup>
11924
<ItemGroup>
120-
<ProjectReference Include="..\SourcepawnCondenser\SourcepawnCondenser.csproj">
121-
<Project>{b4e00f2d-dd73-42c7-a0ca-ba92b2a05850}</Project>
122-
<Name>SourcepawnCondenser</Name>
123-
</ProjectReference>
25+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
26+
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
12427
</ItemGroup>
125-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
126-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
127-
Other similar extension points exist, see Microsoft.Common.targets.
128-
<Target Name="BeforeBuild">
129-
</Target>
130-
<Target Name="AfterBuild">
131-
</Target>
132-
-->
13328
</Project>

‎SourcepawnCondenser/CondenserTest/MainWindow.xaml.cs‎

Lines changed: 54 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,11 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
4949
foreach (var token in t)
5050
{
5151
++i;
52-
var g = new Grid() { Background = ChooseBackgroundFromTokenKind(token.Kind) };
53-
g.Tag = token;
52+
var g = new Grid
53+
{
54+
Background = ChooseBackgroundFromTokenKind(token.Kind),
55+
Tag = token
56+
};
5457
g.MouseLeftButtonUp += G_MouseLeftButtonUp;
5558
g.HorizontalAlignment = HorizontalAlignment.Stretch;
5659
g.Children.Add(new TextBlock() { Text = token.Kind + " - '" + token.Value + "'", IsHitTestVisible = false });
@@ -69,8 +72,12 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
6972
var functionItem = new TreeViewItem() { Header = "functions (" + def.Functions.Count + ")", IsExpanded = expand };
7073
foreach (var f in def.Functions)
7174
{
72-
var item = new TreeViewItem() { Header = f.Name, IsExpanded = expand };
73-
item.Tag = f;
75+
var item = new TreeViewItem
76+
{
77+
Header = f.Name,
78+
IsExpanded = expand,
79+
Tag = f
80+
};
7481
item.MouseLeftButtonUp += ItemFunc_MouseLeftButtonUp;
7582
item.Items.Add(new TreeViewItem() { Header = "Index: " + f.Index, Background = Brushes.LightGray });
7683
item.Items.Add(new TreeViewItem() { Header = "Length: " + f.Length });
@@ -88,8 +95,12 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
8895
var enumItem = new TreeViewItem() { Header = "enums (" + def.Enums.Count + ")", IsExpanded = expand };
8996
foreach (var en in def.Enums)
9097
{
91-
var item = new TreeViewItem() { Header = string.IsNullOrWhiteSpace(en.Name) ? "no name" : en.Name, IsExpanded = expand };
92-
item.Tag = en;
98+
var item = new TreeViewItem
99+
{
100+
Header = string.IsNullOrWhiteSpace(en.Name) ? "no name" : en.Name,
101+
IsExpanded = expand,
102+
Tag = en
103+
};
93104
item.MouseLeftButtonUp += ItemEnum_MouseLeftButtonUp;
94105
item.Items.Add(new TreeViewItem() { Header = "Index: " + en.Index, Background = Brushes.LightGray });
95106
item.Items.Add(new TreeViewItem() { Header = "Length: " + en.Length });
@@ -104,8 +115,12 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
104115
var structItem = new TreeViewItem() { Header = "structs (" + def.Structs.Count + ")", IsExpanded = expand };
105116
foreach (var s in def.Structs)
106117
{
107-
var item = new TreeViewItem() { Header = string.IsNullOrWhiteSpace(s.Name) ? "no name" : s.Name, IsExpanded = expand };
108-
item.Tag = s;
118+
var item = new TreeViewItem
119+
{
120+
Header = string.IsNullOrWhiteSpace(s.Name) ? "no name" : s.Name,
121+
IsExpanded = expand,
122+
Tag = s
123+
};
109124
item.MouseLeftButtonUp += ItemStruct_MouseLeftButtonUp;
110125
item.Items.Add(new TreeViewItem() { Header = "Index: " + s.Index, Background = Brushes.LightGray });
111126
item.Items.Add(new TreeViewItem() { Header = "Length: " + s.Length });
@@ -116,8 +131,12 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
116131
var dItem = new TreeViewItem() { Header = "defines (" + def.Defines.Count + ")", IsExpanded = expand };
117132
foreach (var d in def.Defines)
118133
{
119-
var item = new TreeViewItem() { Header = d.Name, IsExpanded = expand };
120-
item.Tag = d;
134+
var item = new TreeViewItem
135+
{
136+
Header = d.Name,
137+
IsExpanded = expand,
138+
Tag = d
139+
};
121140
item.MouseLeftButtonUp += Itemppd_MouseLeftButtonUp;
122141
item.Items.Add(new TreeViewItem() { Header = "Index: " + d.Index, Background = Brushes.LightGray });
123142
item.Items.Add(new TreeViewItem() { Header = "Length: " + d.Length });
@@ -128,8 +147,12 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
128147
var cItem = new TreeViewItem() { Header = "constants (" + def.ConstVariables.Count + ")", IsExpanded = expand };
129148
foreach (var cn in def.ConstVariables)
130149
{
131-
var item = new TreeViewItem() { Header = cn.Name, IsExpanded = expand };
132-
item.Tag = cn;
150+
var item = new TreeViewItem
151+
{
152+
Header = cn.Name,
153+
IsExpanded = expand,
154+
Tag = cn
155+
};
133156
item.MouseLeftButtonUp += Itemc_MouseLeftButtonUp;
134157
item.Items.Add(new TreeViewItem() { Header = "Index: " + cn.Index, Background = Brushes.LightGray });
135158
item.Items.Add(new TreeViewItem() { Header = "Length: " + cn.Length });
@@ -140,8 +163,12 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
140163
var mItem = new TreeViewItem() { Header = "methodmaps (" + def.Methodmaps.Count + ")", IsExpanded = expand };
141164
foreach (var m in def.Methodmaps)
142165
{
143-
var item = new TreeViewItem() { Header = m.Name, IsExpanded = expand };
144-
item.Tag = m;
166+
var item = new TreeViewItem
167+
{
168+
Header = m.Name,
169+
IsExpanded = expand,
170+
Tag = m
171+
};
145172
item.MouseLeftButtonUp += ItemMM_MouseLeftButtonUp;
146173
item.Items.Add(new TreeViewItem() { Header = "Index: " + m.Index, Background = Brushes.LightGray });
147174
item.Items.Add(new TreeViewItem() { Header = "Length: " + m.Length });
@@ -174,8 +201,12 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
174201
var eItem = new TreeViewItem() { Header = "EnumStructs (" + def.EnumStructs.Count + ")", IsExpanded = expand };
175202
foreach (var m in def.EnumStructs)
176203
{
177-
var item = new TreeViewItem() { Header = m.Name, IsExpanded = expand };
178-
item.Tag = m;
204+
var item = new TreeViewItem
205+
{
206+
Header = m.Name,
207+
IsExpanded = expand,
208+
Tag = m
209+
};
179210
item.MouseLeftButtonUp += ItemMM_MouseLeftButtonUp;
180211
item.Items.Add(new TreeViewItem() { Header = "Index: " + m.Index, Background = Brushes.LightGray });
181212
item.Items.Add(new TreeViewItem() { Header = "Length: " + m.Length });
@@ -219,8 +250,12 @@ private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
219250
var vItem = new TreeViewItem() { Header = "Variables (" + def.ConstVariables.Count + ")", IsExpanded = expand };
220251
foreach (var v in def.Variables)
221252
{
222-
var item = new TreeViewItem() { Header = v.Name, IsExpanded = expand };
223-
item.Tag = v;
253+
var item = new TreeViewItem
254+
{
255+
Header = v.Name,
256+
IsExpanded = expand,
257+
Tag = v
258+
};
224259
item.MouseLeftButtonUp += Itemc_MouseLeftButtonUp;
225260
item.Items.Add(new TreeViewItem() { Header = "Index: " + v.Index, Background = Brushes.LightGray });
226261
item.Items.Add(new TreeViewItem() { Header = "Length: " + v.Length });
@@ -324,7 +359,7 @@ private void G_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
324359
}
325360
}
326361

327-
private Brush ChooseBackgroundFromTokenKind(TokenKind kind)
362+
private static Brush ChooseBackgroundFromTokenKind(TokenKind kind)
328363
{
329364
return kind switch
330365
{

‎SourcepawnCondenser/CondenserTest/Properties/AssemblyInfo.cs‎

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

‎Spcode.sln‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 17
43
VisualStudioVersion = 17.0.31612.314
@@ -12,12 +11,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPCodeUpdater", "Deploy\Spc
1211
EndProject
1312
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourcepawnCondenser", "SourcepawnCondenser\SourcepawnCondenser\SourcepawnCondenser.csproj", "{B4E00F2D-DD73-42C7-A0CA-BA92B2A05850}"
1413
EndProject
15-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CondenserTest", "SourcepawnCondenser\CondenserTest\CondenserTest.csproj", "{B1E03089-FD98-4C01-828F-8CB05F87462F}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CondenserTest", "SourcepawnCondenser\CondenserTest\CondenserTest.csproj", "{B1E03089-FD98-4C01-828F-8CB05F87462F}"
1615
ProjectSection(ProjectDependencies) = postProject
1716
{B4E00F2D-DD73-42C7-A0CA-BA92B2A05850} = {B4E00F2D-DD73-42C7-A0CA-BA92B2A05850}
1817
EndProjectSection
1918
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPCodeBenchmarks", "SPCodeBenchmarks\SPCodeBenchmarks.csproj", "{590A7837-3804-4B8B-A9C8-2F270A55522A}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SPCodeBenchmarks", "SPCodeBenchmarks\SPCodeBenchmarks.csproj", "{590A7837-3804-4B8B-A9C8-2F270A55522A}"
2120
EndProject
2221
Global
2322
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -143,8 +142,8 @@ Global
143142
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug|x64.Build.0 = Debug|Any CPU
144143
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug|x86.ActiveCfg = Debug|Any CPU
145144
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug|x86.Build.0 = Debug|Any CPU
146-
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug-Beta|Any CPU.ActiveCfg = Debug-Beta|Any CPU
147-
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug-Beta|Any CPU.Build.0 = Debug-Beta|Any CPU
145+
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug-Beta|Any CPU.ActiveCfg = Debug|Any CPU
146+
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug-Beta|Any CPU.Build.0 = Debug|Any CPU
148147
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug-Beta|ARM.ActiveCfg = Debug-Beta|Any CPU
149148
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug-Beta|ARM.Build.0 = Debug-Beta|Any CPU
150149
{B1E03089-FD98-4C01-828F-8CB05F87462F}.Debug-Beta|x64.ActiveCfg = Debug-Beta|Any CPU

0 commit comments

Comments
 (0)