Skip to content

Commit c6d3761

Browse files
authored
updated .Net core sample
1 parent 0c62080 commit c6d3761

File tree

5 files changed

+40
-177
lines changed

5 files changed

+40
-177
lines changed

MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:SyntaxEditor_CustomLanguage"
7-
xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity"
7+
xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
88
xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
99
syncfusion:SfSkinManager.Theme="{syncfusion:SkinManagerExtension ThemeName=MaterialDark}"
1010
xmlns:system="clr-namespace:System;assembly=mscorlib"

Properties/AssemblyInfo.cs

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,4 @@
1-
using System.Reflection;
2-
using System.Resources;
3-
using System.Runtime.CompilerServices;
4-
using System.Runtime.InteropServices;
5-
using System.Windows;
6-
7-
// General Information about an assembly is controlled through the following
8-
// set of attributes. Change these attribute values to modify the information
9-
// associated with an assembly.
10-
[assembly: AssemblyTitle("SyntaxEditor_CustomLanguage")]
11-
[assembly: AssemblyDescription("")]
12-
[assembly: AssemblyConfiguration("")]
13-
[assembly: AssemblyCompany("")]
14-
[assembly: AssemblyProduct("SyntaxEditor_CustomLanguage")]
15-
[assembly: AssemblyCopyright("Copyright © 2020")]
16-
[assembly: AssemblyTrademark("")]
17-
[assembly: AssemblyCulture("")]
18-
19-
// Setting ComVisible to false makes the types in this assembly not visible
20-
// to COM components. If you need to access a type in this assembly from
21-
// COM, set the ComVisible attribute to true on that type.
22-
[assembly: ComVisible(false)]
23-
24-
//In order to begin building localizable applications, set
25-
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
26-
//inside a <PropertyGroup>. For example, if you are using US english
27-
//in your source files, set the <UICulture> to en-US. Then uncomment
28-
//the NeutralResourceLanguage attribute below. Update the "en-US" in
29-
//the line below to match the UICulture setting in the project file.
30-
31-
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
32-
1+
using System.Windows;
332

343
[assembly: ThemeInfo(
354
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
@@ -39,17 +8,3 @@
398
//(used if a resource is not found in the page,
409
// app, or any theme specific resource dictionaries)
4110
)]
42-
43-
44-
// Version information for an assembly consists of the following four values:
45-
//
46-
// Major Version
47-
// Minor Version
48-
// Build Number
49-
// Revision
50-
//
51-
// You can specify all the values or you can default the Build and Revision Numbers
52-
// by using the '*' as shown below:
53-
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.0.0")]
55-
[assembly: AssemblyFileVersion("1.0.0.0")]

SyntaxEditor_CustomLanguage.csproj

Lines changed: 20 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,34 @@
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.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{038C47FC-EEDA-4E3D-833E-90F3C983F563}</ProjectGuid>
84
<OutputType>WinExe</OutputType>
9-
<RootNamespace>SyntaxEditor_CustomLanguage</RootNamespace>
10-
<AssemblyName>SyntaxEditor_CustomLanguage</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<WarningLevel>4</WarningLevel>
15-
<Deterministic>true</Deterministic>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<UseWPF>true</UseWPF>
167
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<PlatformTarget>AnyCPU</PlatformTarget>
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>
8+
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
10+
<DefineConstants>TRACE;NETCore</DefineConstants>
2611
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<PlatformTarget>AnyCPU</PlatformTarget>
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
12+
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
14+
<DefineConstants>TRACE;NETCore</DefineConstants>
3515
</PropertyGroup>
16+
3617
<ItemGroup>
37-
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
38-
<HintPath>packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Syncfusion.Edit.WPF, Version=18.4450.0.30, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
41-
<HintPath>packages\Syncfusion.Edit.WPF.18.4.0.30\lib\net45\Syncfusion.Edit.WPF.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Syncfusion.GridCommon.WPF, Version=18.4450.0.30, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
44-
<HintPath>packages\Syncfusion.GridCommon.Wpf.18.4.0.30\lib\net45\Syncfusion.GridCommon.WPF.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Syncfusion.Licensing, Version=18.4450.0.30, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
47-
<HintPath>packages\Syncfusion.Licensing.18.4.0.30\lib\net45\Syncfusion.Licensing.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Syncfusion.SfSkinManager.WPF, Version=18.4450.0.30, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
50-
<HintPath>packages\Syncfusion.SfSkinManager.WPF.18.4.0.30\lib\net45\Syncfusion.SfSkinManager.WPF.dll</HintPath>
51-
</Reference>
52-
<Reference Include="Syncfusion.Shared.WPF, Version=18.4450.0.30, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
53-
<HintPath>packages\Syncfusion.Shared.WPF.18.4.0.30\lib\net45\Syncfusion.Shared.WPF.dll</HintPath>
54-
</Reference>
55-
<Reference Include="Syncfusion.Themes.MaterialDark.WPF, Version=18.4450.0.30, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
56-
<HintPath>packages\Syncfusion.Themes.MaterialDark.WPF.18.4.0.30\lib\net45\Syncfusion.Themes.MaterialDark.WPF.dll</HintPath>
57-
</Reference>
58-
<Reference Include="Syncfusion.Tools.WPF, Version=18.4450.0.30, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
59-
<HintPath>packages\Syncfusion.Tools.WPF.18.4.0.30\lib\net45\Syncfusion.Tools.WPF.dll</HintPath>
60-
</Reference>
61-
<Reference Include="System" />
62-
<Reference Include="System.Data" />
63-
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>
65-
</Reference>
66-
<Reference Include="System.Xml" />
67-
<Reference Include="Microsoft.CSharp" />
68-
<Reference Include="System.Core" />
69-
<Reference Include="System.Xml.Linq" />
70-
<Reference Include="System.Data.DataSetExtensions" />
71-
<Reference Include="System.Net.Http" />
72-
<Reference Include="System.Xaml">
73-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
74-
</Reference>
75-
<Reference Include="WindowsBase" />
76-
<Reference Include="PresentationCore" />
77-
<Reference Include="PresentationFramework" />
18+
<None Remove="Data\syntaxeditor\PythonSource.py" />
7819
</ItemGroup>
20+
7921
<ItemGroup>
80-
<ApplicationDefinition Include="App.xaml">
81-
<Generator>MSBuild:Compile</Generator>
82-
<SubType>Designer</SubType>
83-
</ApplicationDefinition>
84-
<Compile Include="ViewModel\CustomLanguageViewModel.cs" />
85-
<Compile Include="ViewModel\PythonLanguage.cs" />
86-
<Resource Include="Assets\syntaxeditor\PathIcon.xaml">
87-
<Generator>MSBuild:Compile</Generator>
88-
<SubType>Designer</SubType>
89-
</Resource>
90-
<Page Include="MainWindow.xaml">
91-
<Generator>MSBuild:Compile</Generator>
92-
<SubType>Designer</SubType>
93-
</Page>
94-
<Compile Include="App.xaml.cs">
95-
<DependentUpon>App.xaml</DependentUpon>
96-
<SubType>Code</SubType>
97-
</Compile>
98-
<Compile Include="MainWindow.xaml.cs">
99-
<DependentUpon>MainWindow.xaml</DependentUpon>
100-
<SubType>Code</SubType>
101-
</Compile>
22+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
23+
<PackageReference Include="Syncfusion.Edit.WPF" Version="18.4.0.30" />
24+
<PackageReference Include="Syncfusion.SfSkinManager.WPF" Version="18.4.0.30" />
25+
<PackageReference Include="Syncfusion.Themes.MaterialDark.WPF" Version="18.4.0.30" />
10226
</ItemGroup>
27+
10328
<ItemGroup>
104-
<Compile Include="Properties\AssemblyInfo.cs">
105-
<SubType>Code</SubType>
106-
</Compile>
107-
<Compile Include="Properties\Resources.Designer.cs">
108-
<AutoGen>True</AutoGen>
109-
<DesignTime>True</DesignTime>
110-
<DependentUpon>Resources.resx</DependentUpon>
111-
</Compile>
112-
<Compile Include="Properties\Settings.Designer.cs">
113-
<AutoGen>True</AutoGen>
114-
<DependentUpon>Settings.settings</DependentUpon>
115-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
116-
</Compile>
117-
<EmbeddedResource Include="Properties\Resources.resx">
118-
<Generator>ResXFileCodeGenerator</Generator>
119-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
120-
</EmbeddedResource>
12129
<Content Include="Data\syntaxeditor\PythonSource.py">
12230
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12331
</Content>
124-
<None Include="packages.config" />
125-
<None Include="Properties\Settings.settings">
126-
<Generator>SettingsSingleFileGenerator</Generator>
127-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
128-
</None>
12932
</ItemGroup>
130-
<ItemGroup>
131-
<None Include="App.config" />
132-
</ItemGroup>
133-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
134-
</Project>
33+
34+
</Project>
Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<ProjectView>ShowAllFiles</ProjectView>
5-
</PropertyGroup>
3+
<PropertyGroup />
4+
<ItemGroup>
5+
<ApplicationDefinition Update="App.xaml">
6+
<SubType>Designer</SubType>
7+
</ApplicationDefinition>
8+
</ItemGroup>
9+
<ItemGroup>
10+
<Page Update="MainWindow.xaml">
11+
<SubType>Designer</SubType>
12+
</Page>
13+
</ItemGroup>
614
</Project>

SyntaxEditor_CustomLanguage.sln

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

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30717.126
4+
VisualStudioVersion = 16.0.30804.86
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxEditor_CustomLanguage", "SyntaxEditor_CustomLanguage.csproj", "{038C47FC-EEDA-4E3D-833E-90F3C983F563}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxEditor_CustomLanguage", "SyntaxEditor_CustomLanguage.csproj", "{8FAAE4D3-0C17-446E-9C20-CEBCA3CBBBBF}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{038C47FC-EEDA-4E3D-833E-90F3C983F563}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{038C47FC-EEDA-4E3D-833E-90F3C983F563}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{038C47FC-EEDA-4E3D-833E-90F3C983F563}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{038C47FC-EEDA-4E3D-833E-90F3C983F563}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{8FAAE4D3-0C17-446E-9C20-CEBCA3CBBBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{8FAAE4D3-0C17-446E-9C20-CEBCA3CBBBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{8FAAE4D3-0C17-446E-9C20-CEBCA3CBBBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{8FAAE4D3-0C17-446E-9C20-CEBCA3CBBBBF}.Release|Any CPU.Build.0 = Release|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE
2121
EndGlobalSection
2222
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {20605CB9-B127-42B0-BC15-7138A6399519}
23+
SolutionGuid = {73A75B9C-E076-4CA0-80FF-C46BBEB392BC}
2424
EndGlobalSection
2525
EndGlobal

0 commit comments

Comments
 (0)