Skip to content

Commit

Permalink
码神工具v8，NET6平台
Browse files Browse the repository at this point in the history
  • Loading branch information
@nnhy
nnhy committed Dec 11, 2021
1 parent ccefc67 commit a3450c4
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 596 deletions.
108 changes: 7 additions & 101 deletions CrazyCoder/CrazyCoder.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,118 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{AC49462F-ED94-40F6-BF92-728937BFBAFE}</ProjectGuid>
<TargetFramework>net6.0</TargetFramework>
<OutputType>WinExe</OutputType>
<RootNamespace>CrazyCoder</RootNamespace>
<AssemblyName>CrazyCoder</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<Deterministic>false</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\Bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<OutputPath>..\Bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Images\leaf.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Models\MenuModel.cs" />
<Compile Include="Setting.cs" />
<Compile Include="ViewModels\MainViewModel.cs" />
<Compile Include="Views\RegexWindow.xaml.cs">
<DependentUpon>RegexWindow.xaml</DependentUpon>
</Compile>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="Views\RegexWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<Resource Include="Fonts\iconfont.ttf" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MaterialDesignThemes">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="MvvmLightLibs">
<Version>5.4.1.1</Version>
</PackageReference>
Expand All @@ -125,6 +31,7 @@
<PackageReference Include="NewLife.XCode">
<Version>10.3.2021.1204</Version>
</PackageReference>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\leaf.ico" />
Expand All @@ -133,5 +40,4 @@
<ItemGroup>
<Folder Include="Converters\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
117 changes: 117 additions & 0 deletions XCoder/CrazyCoder.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<AssemblyTitle>新生命码神工具</AssemblyTitle>
<Description>众多开发者工具，网络、串口、加解密、正则表达式、Modbus</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2021 NewLife</Copyright>
<Version>8.0.2021.1211</Version>
<FileVersion>8.0.2021.1211</FileVersion>
<AssemblyVersion>8.0.*</AssemblyVersion>
<Deterministic>false</Deterministic>
<ApplicationIcon>leaf.ico</ApplicationIcon>
<LangVersion>latest</LangVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<OutputPath>..\Bin\CrazyCoder</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.configuration" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Messaging" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
</ItemGroup>
<ItemGroup>
<Compile Update="XCom\SerialPortList.cs">
<SubType>UserControl</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="leaf.ico" />
<EmbeddedResource Include="UpdateInfo.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="XICO\leaf.png" />
<EmbeddedResource Include="XRegex\Pattern\Html\无嵌套标记.txt" />
<EmbeddedResource Include="XRegex\Pattern\SQL查询\嵌套查询.txt" />
<EmbeddedResource Include="XRegex\Pattern\SQL查询\简单.txt" />
<EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例.txt" />
<EmbeddedResource Include="XRegex\Pattern\平衡组\完整示例固化分组.txt" />
<EmbeddedResource Include="XRegex\Pattern\平衡组\标准.txt" />
<EmbeddedResource Include="XRegex\Pattern\平衡组\标准固化分组.txt" />
<EmbeddedResource Include="XRegex\Pattern\网页\最外层嵌套.txt" />
<EmbeddedResource Include="XRegex\Sample\SQL查询\MSSQL表结构.txt" />
<EmbeddedResource Include="XRegex\Sample\SQL查询\普通嵌套查询.txt" />
<EmbeddedResource Include="XRegex\Sample\SQL查询\普通查询.txt" />
<EmbeddedResource Include="XRegex\Sample\平衡组\算术表达式.txt" />
<EmbeddedResource Include="XRegex\Sample\网页\最外层嵌套.txt" />
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<Content Include="数据库命名规范.txt" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
<PackageReference Include="NewLife.Core">
<Version>8.11.2021.1204</Version>
</PackageReference>
<PackageReference Include="NewLife.MQTT">
<Version>1.0.2021.1204</Version>
</PackageReference>
<PackageReference Include="NewLife.Net">
<Version>3.6.2021.1204</Version>
</PackageReference>
<PackageReference Include="NewLife.Redis">
<Version>3.9.2021.1204</Version>
</PackageReference>
<PackageReference Include="NewLife.Stardust">
<Version>1.5.2021.1204</Version>
</PackageReference>
<PackageReference Include="NewLife.WinCore" Version="8.11.2021.1204" />
<PackageReference Include="NewLife.XCode">
<Version>10.3.2021.1204</Version>
</PackageReference>
<PackageReference Include="SSH.NET">
<Version>2020.0.1</Version>
</PackageReference>
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
<PackageReference Include="System.Management" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Star\" />
</ItemGroup>
<ItemGroup>
<Compile Remove="NewModelForm\AddField.cs" />
<Compile Remove="NewModelForm\AddField.Designer.cs" />
<Compile Remove="NewModelForm\AddTable.cs" />
<Compile Remove="NewModelForm\AddTable.Designer.cs" />
<Compile Remove="NewModelForm\BaseForm.cs" />
<Compile Remove="NewModelForm\BaseForm.designer.cs" />
<Compile Remove="NewModelForm\NewModel.cs" />
<Compile Remove="NewModelForm\NewModel.Designer.cs" />
<Compile Remove="NewModelForm\WinFormHelper.cs" />
<Compile Remove="XMessage\FrmMain.cs" />
<Compile Remove="XMessage\FrmMain.designer.cs" />
<Compile Remove="XMessage\MessageConfig.cs" />
<Compile Remove="XNet\MySqlParser.cs" />
<EmbeddedResource Remove="NewModelForm\AddField.resx" />
<EmbeddedResource Remove="NewModelForm\AddTable.resx" />
<EmbeddedResource Remove="NewModelForm\BaseForm.resx" />
<EmbeddedResource Remove="NewModelForm\NewModel.resx" />
<EmbeddedResource Remove="XMessage\FrmMain.resx" />
</ItemGroup>
<PropertyGroup>
<PostBuildEvent>del "$(TargetDir)*.xml" /q</PostBuildEvent>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion XCoder/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ static class Program
[STAThread]
static void Main()
{
#if NC30
#if NET5_0_OR_GREATER
XTrace2.UseWinForm();
Application.SetHighDpiMode(HighDpiMode.SystemAware);
#else
Expand Down
Loading

0 comments on commit a3450c4

Please sign in to comment.