merge complete

EAVFW · Feb 14, 2024 · 28ea615 · 28ea615
2 parents 06b3535 + a4049e5
commit 28ea615
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,10 @@
+<Project>
+    <Import Condition="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')) != ''" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+ <PropertyGroup>
+   <LangVersion>10.0</LangVersion>
+   <EAVFrameworkVersion Condition="'$(EAVFrameworkVersion)' == ''">4.1.1</EAVFrameworkVersion>
+   <UseEAVFromNuget Condition="'$(UseEAVFromNuget)' == ''">true</UseEAVFromNuget>
+   <LocalEAVFrameworkPath Condition="'$(LocalEAVFrameworkPath)' == ''">$(MSBuildThisFileDirectory)/external/EAVFramework</LocalEAVFrameworkPath>
+   <LocalExternalpath Condition="'$(LocalExternalpath)' == ''">$(MSBuildThisFileDirectory)/external</LocalExternalpath>
+ </PropertyGroup>
+</Project>
diff --git a/src/EAVFW.Extensions.SecurityModel/EAVFW.Extensions.SecurityModel.csproj b/src/EAVFW.Extensions.SecurityModel/EAVFW.Extensions.SecurityModel.csproj
@@ -17,11 +17,12 @@
 		<None Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="\" />
 		<None Include="manifest.extensions.json" Pack="true" PackagePath="eavfw/manifest/" />
 	</ItemGroup>
+
+
     <ItemGroup Condition="$(UseEAVFromNuget) == 'false'">
         <ProjectReference Include="$(LocalEAVFrameworkPath)\src\EAVFramework.csproj" />
     </ItemGroup>
     <ItemGroup Condition="$(UseEAVFromNuget) != 'false'">
-        <PackageReference Include="EAVFramework" Version="4.0.2" />
+        <PackageReference Include="EAVFramework" Version="$(EAVFrameworkVersion)" />
     </ItemGroup>
-
 </Project>