Миграция на .Net6/C#10

seljmov · Feb 26, 2022 · 00d34d6 · 00d34d6
1 parent dcff68b
commit 00d34d6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,7 @@
 cloc.exe
 .editorconfig
 
+**/.DS_Store/
+
 */obj/
-*/bin/
+*/bin/
diff --git a/Semantic-Interpreter.sln b/Semantic-Interpreter.sln
@@ -1,5 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semantic-Interpreter", "Semantic-Interpreter\Semantic-Interpreter.csproj", "{F694D570-905D-4363-8B86-756DF1028517}"
 EndProject
 Global
@@ -13,4 +14,13 @@ Global
 		{F694D570-905D-4363-8B86-756DF1028517}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F694D570-905D-4363-8B86-756DF1028517}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.TextStylePolicy = $1
+		$1.FileWidth = 80
+		$1.TabsToSpaces = True
+		$1.scope = text/x-csharp
+		$0.CSharpFormattingPolicy = $2
+		$2.scope = text/x-csharp
+	EndGlobalSection
 EndGlobal
diff --git a/Semantic-Interpreter/Program.cs b/Semantic-Interpreter/Program.cs
@@ -7,7 +7,9 @@ namespace Semantic_Interpreter
 {
     public static class Program
     {
-        private const string Demo = @"E:\Education\Own\Semantic-Language\Semantic-Interpreter\Demo\";
+        private const string _windowsDemoFolder = @"E:\Education\Own\Semantic-Language\Semantic-Interpreter\Demo\";
+        private const string _macDemoFolder = @"/Users/seljmov/ArtWorks/Personal/Semantic-Language/Semantic-Interpreter/Demo/";
+        private const string Demo = _macDemoFolder;
         public static void Main()
         {
             using var reader = new StreamReader(Demo + "array4.slang");

diff --git a/Semantic-Interpreter/Semantic-Interpreter.csproj b/Semantic-Interpreter/Semantic-Interpreter.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <RootNamespace>Semantic_Interpreter</RootNamespace>
-        <LangVersion>9</LangVersion>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
 
 </Project>