- Upgraded packages to support dotnet8

RonSijm · Feb 28, 2024 · 20a3e55 · 20a3e55
1 parent 680ddeb
commit 20a3e55
Show file tree

Hide file tree

Showing 27 changed files with 211 additions and 156 deletions.
diff --git a/BuildSettings/DependencyInjectionAbstractionsForFramework.props b/BuildSettings/DependencyInjectionAbstractionsForFramework.props
@@ -0,0 +1,13 @@
+<Project>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.*" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.*" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.*" />
+	</ItemGroup>
+</Project>
diff --git a/BuildSettings/NuGetVersioning.props b/BuildSettings/NuGetVersioning.props
@@ -0,0 +1,7 @@
+<Project>
+  	<PropertyGroup>
+        <Authors>Ron Sijm</Authors>
+		<Company>Ron Sijm</Company>
+        <VersionPrefix>1.2.0</VersionPrefix>
+	</PropertyGroup>
+</Project>
diff --git a/BuildSettings/SupportedFrameworks.props b/BuildSettings/SupportedFrameworks.props
@@ -0,0 +1,9 @@
+<Project>
+  	<PropertyGroup>
+        <LangVersion>preview</LangVersion>
+		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Authors>Ron Sijm</Authors>
+		<Company>Ron Sijm</Company>
+	</PropertyGroup>
+</Project>
diff --git a/BuildSettings/WebAssemblyForFramework.props b/BuildSettings/WebAssemblyForFramework.props
@@ -0,0 +1,13 @@
+<Project>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.*" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.*" />
+	</ItemGroup>
+</Project>
diff --git a/....Demo.Blazyload.WeatherLib4.Component/RonSijm.Demo.Blazyload.WeatherLib4.Component.csproj b/....Demo.Blazyload.WeatherLib4.Component/RonSijm.Demo.Blazyload.WeatherLib4.Component.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/...de/RonSijm.Demo.Blazyload.WeatherLib4.Page/RonSijm.Demo.Blazyload.WeatherLib4.Page.csproj b/...de/RonSijm.Demo.Blazyload.WeatherLib4.Page/RonSijm.Demo.Blazyload.WeatherLib4.Page.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Examples/CustomPathing/RonSijm.Demo.Blazyload.CustomPathing.Host/App.razor b/Examples/CustomPathing/RonSijm.Demo.Blazyload.CustomPathing.Host/App.razor
@@ -35,20 +35,20 @@
         {
             if (args.Path == "fetchdata1")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssembliesAsync(new[] { "RonSijm.Demo.Blazyload.WeatherLib1.dll" });
+                var assemblies = await BlazyAssemblyLoader.LoadAssembliesAsync(new[] { "RonSijm.Demo.Blazyload.WeatherLib1.wasm" });
                 _lazyLoadedAssemblies.AddRange(assemblies);
             }
             else if (args.Path == "fetchdata2")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssembliesAsync(new[] { "RonSijm.Demo.Blazyload.WeatherLib2.dll" });
+                var assemblies = await BlazyAssemblyLoader.LoadAssembliesAsync(new[] { "RonSijm.Demo.Blazyload.WeatherLib2.wasm" });
             }
             else if (args.Path == "fetchdata3")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssembliesAsync(new[] { "RonSijm.Demo.Blazyload.WeatherLib3.dll" });
+                var assemblies = await BlazyAssemblyLoader.LoadAssembliesAsync(new[] { "RonSijm.Demo.Blazyload.WeatherLib3.wasm" });
             }
             else if (args.Path == "fetchdata4")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssembliesAsync(new[] { "RonSijm.Demo.Blazyload.WeatherLib4.Page.dll" });
+                var assemblies = await BlazyAssemblyLoader.LoadAssembliesAsync(new[] { "RonSijm.Demo.Blazyload.WeatherLib4.Page.wasm" });
             }
         }
         catch (Exception)

diff --git a/Examples/CustomPathing/RonSijm.Demo.Blazyload.CustomPathing.Host/Auth/DummyAuthHandler.cs b/Examples/CustomPathing/RonSijm.Demo.Blazyload.CustomPathing.Host/Auth/DummyAuthHandler.cs
@@ -4,7 +4,7 @@ public class DummyAuthHandler
 {
     public bool HandleAuth(string assembly, HttpRequestMessage httpMessage, BlazyAssemblyOptions assemblyOptions)
     {
-        if (assembly == "RonSijm.Demo.Blazyload.WeatherLib2.dll")
+        if (assembly == "RonSijm.Demo.Blazyload.WeatherLib2.wasm")
         {
             httpMessage.Headers.Add("authorization", "Bearer eyJhb-mock-auth-header");
             if (httpMessage.RequestUri != null)

diff --git a/Examples/CustomPathing/RonSijm.Demo.Blazyload.CustomPathing.Host/Pages/AWSAuth.razor.cs b/Examples/CustomPathing/RonSijm.Demo.Blazyload.CustomPathing.Host/Pages/AWSAuth.razor.cs
@@ -27,7 +27,7 @@ protected async Task HandleSubmitAndLoad()
         if (Model != null)
         {
             AWSAuthHandler.SetCredentials(Model.BucketUrl, Model.AccessKey, Model.SecretKey);
-            await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib3.dll");
+            await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib3.wasm");
             ButtonColor = "btn-success";
         }
     }

diff --git a/...onSijm.Demo.Blazyload.CustomPathing.Host/RonSijm.Demo.Blazyload.CustomPathing.Host.csproj b/...onSijm.Demo.Blazyload.CustomPathing.Host/RonSijm.Demo.Blazyload.CustomPathing.Host.csproj
@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.S3" Version="3.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.*" PrivateAssets="all" />
   </ItemGroup>
 
 <!--Between here and the bottom-->
 
   <ItemGroup>
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib1.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib2.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib3.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib4.Component.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib4.Page.dll" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib1.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib2.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib3.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib4.Component.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib4.Page.wasm" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,7 +39,12 @@
 <!-- You'd have to leave out both the ProjectReference and the BlazorWebAssemblyLazyLoad though, otherwise the project is non-lazy-loaded -->
 <!-- So leaving in all the project references is easiest. -->
 
-<!-- Post build event to move files from framework -->
+<!-- Pre build event to remove _framework folder -->
+<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+	<Exec Command="rd /s /q &quot;$(ProjectDir)wwwroot\_framework\&quot;" />
+</Target>
+
+	<!-- Post build event to move files from framework -->
 <Target Name="PostBuild" AfterTargets="PostBuildEvent">
 	<Exec Command="rd /s /q &quot;$(ProjectDir)wwwroot\_framework\WeatherLib1&quot; &amp; mkdir &quot;$(ProjectDir)wwwroot\_framework\WeatherLib1&quot;" />
 	<Exec Command="move /Y &quot;$(TargetDir)wwwroot\_framework\*WeatherLib1*&quot; &quot;$(ProjectDir)wwwroot\_framework\WeatherLib1&quot;" />

diff --git a/...azyload.WeatherLibOptionalNotNull/RonSijm.Demo.Blazyload.WeatherLibOptionalNotNull.csproj b/...azyload.WeatherLibOptionalNotNull/RonSijm.Demo.Blazyload.WeatherLibOptionalNotNull.csproj
@@ -1,16 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<PackageReference Include="RonSijm.Blazyload.Library" Version="1.*" />
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(Configuration)' == 'debug'">
+		<ProjectReference Include="..\..\..\src\RonSijm.Blazyload.Library\RonSijm.Blazyload.Library.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(Configuration)' != 'debug'">
+		<PackageReference Include="RonSijm.Blazyload.Library" Version="1.*" />
+	</ItemGroup>
+
 </Project>
diff --git a/...emo.Blazyload.WeatherLibOptionalNull/RonSijm.Demo.Blazyload.WeatherLibOptionalNull.csproj b/...emo.Blazyload.WeatherLibOptionalNull/RonSijm.Demo.Blazyload.WeatherLibOptionalNull.csproj
@@ -1,15 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(Configuration)' == 'debug'">
+		<ProjectReference Include="..\..\..\src\RonSijm.Blazyload.Library\RonSijm.Blazyload.Library.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(Configuration)' != 'debug'">
 		<PackageReference Include="RonSijm.Blazyload.Library" Version="1.*" />
 	</ItemGroup>
 

diff --git a/Examples/RonSijm.Demo.Blazyload.Host/App.razor b/Examples/RonSijm.Demo.Blazyload.Host/App.razor
@@ -23,32 +23,32 @@
         {
             if (args.Path == "fetchdata1")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib1.dll");
+                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib1.wasm");
                 _lazyLoadedAssemblies.AddRange(assemblies);
             }
             else if (args.Path == "fetchdata2")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib2.dll");
+                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib2.wasm");
                 _lazyLoadedAssemblies.AddRange(assemblies);
             }
             else if (args.Path == "fetchdata3")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib3.dll");
+                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib3.wasm");
                 _lazyLoadedAssemblies.AddRange(assemblies);
             }
             else if (args.Path == "fetchdata4")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib4.Page.dll");
+                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLib4.Page.wasm");
                 _lazyLoadedAssemblies.AddRange(assemblies);
             }
             else if (args.Path == "fetchdataOptionalNull")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLibOptionalNull.dll");
+                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLibOptionalNull.wasm");
                 _lazyLoadedAssemblies.AddRange(assemblies);
             }
             else if (args.Path == "fetchdataOptionalNotNull")
             {
-                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLibOptionalNotNull.dll");
+                var assemblies = await BlazyAssemblyLoader.LoadAssemblyAsync("RonSijm.Demo.Blazyload.WeatherLibOptionalNotNull.wasm");
                 _lazyLoadedAssemblies.AddRange(assemblies);
             }
         }

diff --git a/Examples/RonSijm.Demo.Blazyload.Host/RonSijm.Demo.Blazyload.Host.csproj b/Examples/RonSijm.Demo.Blazyload.Host/RonSijm.Demo.Blazyload.Host.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.*" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib1.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib2.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib3.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib4.Page.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib4.Component.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLibOptionalNotNull.dll" />
-    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLibOptionalNull.dll" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib1.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib2.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib3.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib4.Page.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLib4.Component.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLibOptionalNotNull.wasm" />
+    <BlazorWebAssemblyLazyLoad Include="RonSijm.Demo.Blazyload.WeatherLibOptionalNull.wasm" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Examples/RonSijm.Demo.Blazyload.WeatherLib1/RonSijm.Demo.Blazyload.WeatherLib1.csproj b/Examples/RonSijm.Demo.Blazyload.WeatherLib1/RonSijm.Demo.Blazyload.WeatherLib1.csproj
@@ -1,15 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
   </ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(Configuration)' == 'debug'">
+		<ProjectReference Include="..\..\src\RonSijm.Blazyload.Library\RonSijm.Blazyload.Library.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(Configuration)' != 'debug'">
 		<PackageReference Include="RonSijm.Blazyload.Library" Version="1.*" />
 	</ItemGroup>
+
 </Project>
diff --git a/Examples/RonSijm.Demo.Blazyload.WeatherLib2/RonSijm.Demo.Blazyload.WeatherLib2.csproj b/Examples/RonSijm.Demo.Blazyload.WeatherLib2/RonSijm.Demo.Blazyload.WeatherLib2.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Examples/RonSijm.Demo.Blazyload.WeatherLib3/RonSijm.Demo.Blazyload.WeatherLib3.csproj b/Examples/RonSijm.Demo.Blazyload.WeatherLib3/RonSijm.Demo.Blazyload.WeatherLib3.csproj
@@ -1,16 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
   </ItemGroup>
 
-	<ItemGroup Condition="'$(Configuration)' == 'debug'">
+	<!--TODO: Update after library nuget for .net8 has been published.-->
+	<!--<ItemGroup Condition="'$(Configuration)' == 'debug'">
 		<PackageReference Include="RonSijm.Blazyload.Library" Version="1.*" />
+	</ItemGroup>-->
+
+	<ItemGroup Condition="'$(Configuration)' == 'debug'">
+		<ProjectReference Include="..\..\src\RonSijm.Blazyload.Library\RonSijm.Blazyload.Library.csproj" />
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(Configuration)' != 'debug'">
+		<PackageReference Include="RonSijm.Blazyload.Library" Version="1.*" />
+	</ItemGroup>
+
+
 </Project>