Move AngouriMath up a folder

Author: Happypig375

Sources/AngouriMath.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 18.1.11312.151 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AngouriMath", "AngouriMath", "{F604DFEB-8939-4B4F-8E37-1FDC06E26D5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AngouriMath", "AngouriMath\AngouriMath\AngouriMath.csproj", "{2D495EED-3C58-4E07-9152-9FE8C3CD522F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AngouriMath", "AngouriMath\AngouriMath.csproj", "{2D495EED-3C58-4E07-9152-9FE8C3CD522F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzers", "Analyzers", "{358BFC2B-1A5B-4740-8BA1-0E53EFC7EDAC}"
 EndProject

Sources/AngouriMath/Directory.Build.props Sources/AngouriMath/AngouriMath.csprojSources/AngouriMath/Directory.Build.props renamed to Sources/AngouriMath/AngouriMath.csproj

@@ -1,6 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <Import Project="$(MSBuildThisFileDirectory)/../Package.Build.props" />
+<Project Sdk="Microsoft.NET.Sdk">
+  
+  <PropertyGroup>
+    <TargetFrameworks>net7.0;netstandard2.0</TargetFrameworks>
+    <PackageId>AngouriMath</PackageId>
+    <Product>AngouriMath</Product>
+  </PropertyGroup>
+  <Import Project="../Package.Build.props" />
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -14,7 +19,7 @@
     <StartupObject />
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     <DocumentationFile>bin/$(Configuration)/$(TargetFramework)/$(MSBuildProjectName).xml</DocumentationFile>
   </PropertyGroup>
 
@@ -45,7 +50,7 @@
     <PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
 
     <!--Analyzers-->
-    <ProjectReference Include="../../Analyzers/Analyzers/Analyzers.csproj" PrivateAssets="all" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
+    <ProjectReference Include="../Analyzers/Analyzers/Analyzers.csproj" PrivateAssets="all" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>
@@ -68,9 +73,7 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>MathAllMethods.tt</DependentUpon>
     </Compile>
-  </ItemGroup>
 
-  <ItemGroup>
     <None Update="Convenience\CompilationExtensions.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>CompilationExtensions.cs</LastGenOutput>
@@ -83,10 +86,8 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>MathAllMethods.cs</LastGenOutput>
     </None>
+  
+    <None Include="extension.dib" Pack="true" PackagePath="interactive-extensions/dotnet" />
+    <Compile Remove="Core/Entity/GenericMath/**" Condition="'$(TargetFramework)' != 'net7.0'" />
   </ItemGroup>
-
-  <ItemGroup>
-      <None Include="../extension.dib" Pack="true" PackagePath="interactive-extensions/dotnet" />
-  </ItemGroup>
-
-</Project>
+</Project>