Fix merge conflicts with master branch

Copilot · 304NotModified · Copilot · commit ff9a56335780 · 2025-08-09T16:54:55.000Z
Co-authored-by: 304NotModified &lt;5808377+304NotModified@users.noreply.github.com&gt;
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+</Project>
diff --git a/UTF-unknown.sln b/UTF-unknown.sln
@@ -12,6 +12,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{089100B1-113F-4E66-888A-E83F3999EAFD}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		Directory.Build.props = Directory.Build.props
 		README.md = README.md
 	EndProjectSection
 EndProject
diff --git a/src/UTF-unknown.csproj b/src/UTF-unknown.csproj
@@ -78,7 +78,12 @@ Features:
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\UtfUnknown.xml</DocumentationFile>
     <NoWarn>1701;1702;1705,1570,1591</NoWarn>
     <!-- Only change AssemblyVersion for major versions --> 
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-  </PropertyGroup>
-
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\logo.png" Pack="true" PackagePath="\" />
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
 </Project>
