isc30 · isc30 · May 9, 2020 · May 9, 2020 · May 9, 2020 · May 9, 2020
diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
@@ -26,16 +26,16 @@ jobs:
         dotnet-version: 3.1.200
 
     - name: Restore library
-      run: dotnet restore BlazorLazyLoading.sln -p:BLLUseLocalNugetPackages=true
+      run: dotnet restore src/BlazorLazyLoading.sln -p:BLLUseLocalNugetPackages=true
 
     - name: Build library
-      run: dotnet build BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
+      run: dotnet build src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
 
     - name: Test library
-      run: dotnet test BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
+      run: dotnet test src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
 
     - name: Pack library
-      run: dotnet pack BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
+      run: dotnet pack src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
 
     - name: Restore demo
       run: dotnet restore demo/Demo.sln -p:BLLUseLocalNugetPackages=true

diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml
@@ -33,16 +33,16 @@ jobs:
         dotnet-version: 3.1.200
 
     - name: Restore library
-      run: dotnet restore BlazorLazyLoading.sln -p:BLLUseLocalNugetPackages=true
+      run: dotnet restore src/BlazorLazyLoading.sln -p:BLLUseLocalNugetPackages=true
 
     - name: Build library
-      run: dotnet build BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
+      run: dotnet build src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
 
     - name: Test library
-      run: dotnet test BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
+      run: dotnet test src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
 
     - name: Pack library
-      run: dotnet pack BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
+      run: dotnet pack src/BlazorLazyLoading.sln -c Release -p:BLLUseLocalNugetPackages=true
 
     - name: Restore demo
       run: dotnet restore demo/Demo.sln -p:BLLUseLocalNugetPackages=true

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <!-- Polyfill $(SolutionDir) -->
-        <SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
-    </PropertyGroup>
-
-    <!-- Convert $(BLLUseLocalNugetPackages) to bool -->
-    <PropertyGroup>
-        <BLLUseLocalNugetPackages Condition="'$(BLLUseLocalNugetPackages)' == ''">false</BLLUseLocalNugetPackages>
+        <RepoDir Condition="'$(RepoDir)' == ''">$(MSBuildThisFileDirectory)</RepoDir>
     </PropertyGroup>
 
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
diff --git a/demo/BlazorLazyLoading.Components.props b/demo/BlazorLazyLoading.Components.props
@@ -6,6 +6,6 @@
 
     <!-- Use Project reference -->
     <ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
-        <ProjectReference Include="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
+        <ProjectReference Include="$(SolutionDir)..\src\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj" />
     </ItemGroup>
 </Project>
diff --git a/demo/BlazorLazyLoading.Module.props b/demo/BlazorLazyLoading.Module.props
@@ -6,8 +6,8 @@
 
     <!-- Use Project reference -->
     <ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
-        <ProjectReference Include="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj" PrivateAssets="all" />
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj" PrivateAssets="all" />
     </ItemGroup>
-    <Import Condition="!$(BLLUseLocalNugetPackages)" Project="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.props" />
-    <Import Condition="!$(BLLUseLocalNugetPackages)" Project="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.targets" />
+    <Import Condition="!$(BLLUseLocalNugetPackages)" Project="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.props" />
+    <Import Condition="!$(BLLUseLocalNugetPackages)" Project="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Module\build\BlazorLazyLoading.Module.targets" />
 </Project>
diff --git a/demo/BlazorLazyLoading.Server.props b/demo/BlazorLazyLoading.Server.props
@@ -6,6 +6,6 @@
 
     <!-- Use Project reference -->
     <ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
-        <ProjectReference Include="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj" PrivateAssets="all" />
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj" PrivateAssets="all" />
     </ItemGroup>
 </Project>
diff --git a/demo/BlazorLazyLoading.Wasm.props b/demo/BlazorLazyLoading.Wasm.props
@@ -6,6 +6,6 @@
 
     <!-- Use Project reference -->
     <ItemGroup Condition="!$(BLLUseLocalNugetPackages)">
-        <ProjectReference Include="$(MSBuildThisFileDirectory)..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj" PrivateAssets="all" />
+        <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj" PrivateAssets="all" />
     </ItemGroup>
 </Project>
diff --git a/demo/Demo.sln b/demo/Demo.sln
@@ -19,18 +19,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorLazyLoading", "BlazorLazyLoading", "{2DFA918F-9417-49B8-9FDA-E2231179978C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Module", "..\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj", "{E3E28F5C-3F96-4634-9528-10C23F2478DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Module", "..\src\nuget\BlazorLazyLoading.Module\BlazorLazyLoading.Module.csproj", "{E3E28F5C-3F96-4634-9528-10C23F2478DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Server", "..\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj", "{6C5945E8-44F9-4898-AB78-FF0D85F5515B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Server", "..\src\nuget\BlazorLazyLoading.Server\BlazorLazyLoading.Server.csproj", "{6C5945E8-44F9-4898-AB78-FF0D85F5515B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Wasm", "..\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj", "{B78FC2FE-F107-49AB-95FC-E7F4559C879A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Wasm", "..\src\nuget\BlazorLazyLoading.Wasm\BlazorLazyLoading.Wasm.csproj", "{B78FC2FE-F107-49AB-95FC-E7F4559C879A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Components", "..\src\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj", "{83419656-8137-4AEB-9A5B-74C7B85621F6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModulesHost", "ModulesHost\ModulesHost.csproj", "{9B062109-5E21-46CD-BDD1-315529E585E8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{2587AE99-7624-47E4-B6B8-79EC67346F67}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorLazyLoading.Components", "..\nuget\BlazorLazyLoading.Components\BlazorLazyLoading.Components.csproj", "{83419656-8137-4AEB-9A5B-74C7B85621F6}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosts", "Hosts", "{E503BF43-DE57-4DB6-AF93-A5F765C94154}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LazyAreas", "LazyAreas", "{566D14F1-B2FB-463C-A627-C5EB23B763B7}"

diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props
@@ -1,5 +1,13 @@
 <Project>
 
+    <!--
+        Enable hierarchical 'Directory.Build.props'
+        This must be imported at the top of the file
+    -->
+    <Import
+        Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
+        Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
+
     <Import Project="LocalNugetVersion.props" />
 
     <PropertyGroup>

diff --git a/BlazorLazyLoading.sln → src/BlazorLazyLoading.sln b/BlazorLazyLoading.sln → src/BlazorLazyLoading.sln
@@ -26,7 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{AE8E1C
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		Directory.Build.props = Directory.Build.props
-		Directory.Build.targets = Directory.Build.targets
 		GitVersion.yml = GitVersion.yml
 		nuget.config = nuget.config
 	EndProjectSection
@@ -51,9 +50,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manifest", "Manifest", "{2B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{38184F2E-7DDA-4F92-B730-85637350E56F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "demo\ServerHost\ServerHost.csproj", "{2EF3EB2F-0E00-4554-8EDC-7CEEE5C7B899}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServerHost", "..\demo\ServerHost\ServerHost.csproj", "{2EF3EB2F-0E00-4554-8EDC-7CEEE5C7B899}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmHost", "demo\WasmHost\WasmHost.csproj", "{D2DF44FE-098D-48EF-925B-F71DFDD7134D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WasmHost", "..\demo\WasmHost\WasmHost.csproj", "{D2DF44FE-098D-48EF-925B-F71DFDD7134D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -8,7 +8,14 @@
         Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
         Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
 
-    <!-- automatically create "Internal" packages -->
-    <Import Project="$(MSBuildThisFileDirectory)../nuget/NugetCommon.props" />
+    <PropertyGroup>
+        <!-- Polyfill $(SolutionDir) -->
+        <SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
+    </PropertyGroup>
+
+    <!-- Convert $(BLLUseLocalNugetPackages) to bool -->
+    <PropertyGroup>
+        <BLLUseLocalNugetPackages Condition="'$(BLLUseLocalNugetPackages)' == ''">false</BLLUseLocalNugetPackages>
+    </PropertyGroup>
 
 </Project>
diff --git a/Dockerfile → src/Dockerfile b/Dockerfile → src/Dockerfile
diff --git a/GitVersion.yml → src/GitVersion.yml b/GitVersion.yml → src/GitVersion.yml
diff --git a/nuget.config → src/nuget.config b/nuget.config → src/nuget.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <packageSources>
-        <add key="local-repo" value="output/nuget/" />
+        <add key="local-repo" value="../output/nuget/" />
     </packageSources>
 </configuration>
diff --git a/...nents/BlazorLazyLoading.Components.csproj → ...nents/BlazorLazyLoading.Components.csproj b/...nents/BlazorLazyLoading.Components.csproj → ...nents/BlazorLazyLoading.Components.csproj
diff --git a/src/nuget/BlazorLazyLoading.Components/demo/LocalNugetVersion.props b/src/nuget/BlazorLazyLoading.Components/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/...ng.Module/BlazorLazyLoading.Module.csproj → ...ng.Module/BlazorLazyLoading.Module.csproj b/...ng.Module/BlazorLazyLoading.Module.csproj → ...ng.Module/BlazorLazyLoading.Module.csproj
diff --git a/...ng.Module/BlazorLazyLoading.Module.nuspec → ...ng.Module/BlazorLazyLoading.Module.nuspec b/...ng.Module/BlazorLazyLoading.Module.nuspec → ...ng.Module/BlazorLazyLoading.Module.nuspec
diff --git a/...dule/build/BlazorLazyLoading.Module.props → ...dule/build/BlazorLazyLoading.Module.props b/...dule/build/BlazorLazyLoading.Module.props → ...dule/build/BlazorLazyLoading.Module.props
diff --git a/...le/build/BlazorLazyLoading.Module.targets → ...le/build/BlazorLazyLoading.Module.targets b/...le/build/BlazorLazyLoading.Module.targets → ...le/build/BlazorLazyLoading.Module.targets
diff --git a/src/nuget/BlazorLazyLoading.Module/demo/LocalNugetVersion.props b/src/nuget/BlazorLazyLoading.Module/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/...ng.Server/BlazorLazyLoading.Server.csproj → ...ng.Server/BlazorLazyLoading.Server.csproj b/...ng.Server/BlazorLazyLoading.Server.csproj → ...ng.Server/BlazorLazyLoading.Server.csproj
diff --git a/...ing.Server/Properties/launchSettings.json → ...ing.Server/Properties/launchSettings.json b/...ing.Server/Properties/launchSettings.json → ...ing.Server/Properties/launchSettings.json
diff --git a/...orLazyLoading.Server/StartupExtensions.cs → ...orLazyLoading.Server/StartupExtensions.cs b/...orLazyLoading.Server/StartupExtensions.cs → ...orLazyLoading.Server/StartupExtensions.cs
diff --git a/src/nuget/BlazorLazyLoading.Server/demo/LocalNugetVersion.props b/src/nuget/BlazorLazyLoading.Server/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/...oading.Wasm/BlazorLazyLoading.Wasm.csproj → ...oading.Wasm/BlazorLazyLoading.Wasm.csproj b/...oading.Wasm/BlazorLazyLoading.Wasm.csproj → ...oading.Wasm/BlazorLazyLoading.Wasm.csproj
diff --git a/...azorLazyLoading.Wasm/StartupExtensions.cs → ...azorLazyLoading.Wasm/StartupExtensions.cs b/...azorLazyLoading.Wasm/StartupExtensions.cs → ...azorLazyLoading.Wasm/StartupExtensions.cs
diff --git a/src/nuget/BlazorLazyLoading.Wasm/demo/LocalNugetVersion.props b/src/nuget/BlazorLazyLoading.Wasm/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/nuget/Directory.Build.props → src/nuget/Directory.Build.props b/nuget/Directory.Build.props → src/nuget/Directory.Build.props
diff --git a/nuget/NugetCommon.props → src/nuget/NugetCommon.props b/nuget/NugetCommon.props → src/nuget/NugetCommon.props
@@ -8,8 +8,8 @@
     </ItemGroup>
 
     <PropertyGroup>
-        <PackageOutputDir>$(MSBuildThisFileDirectory)..\output\nuget</PackageOutputDir>
-        <PackageOutputPath>$(MSBuildThisFileDirectory)..\output\nuget</PackageOutputPath>
+        <PackageOutputDir>$(RepoDir)output\nuget</PackageOutputDir>
+        <PackageOutputPath>$(RepoDir)output\nuget</PackageOutputPath>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -68,7 +68,7 @@
         </ItemGroup>
 
         <WriteLinesToFile
-            File="$(MSBuildThisFileDirectory)../demo/LocalNugetVersion.props"
+            File="$(RepoDir)demo/LocalNugetVersion.props"
             Lines="@(LocalNugetVersionProps)"
             Overwrite="true" />
     </Target>

diff --git a/nuget/icon.png → src/nuget/icon.png b/nuget/icon.png → src/nuget/icon.png
diff --git a/...oader.Server/AssemblyLoader.Server.csproj → ...oader.Server/AssemblyLoader.Server.csproj b/...oader.Server/AssemblyLoader.Server.csproj → ...oader.Server/AssemblyLoader.Server.csproj
diff --git a/...Services/DisposableAssemblyLoadContext.cs → ...Services/DisposableAssemblyLoadContext.cs b/...Services/DisposableAssemblyLoadContext.cs → ...Services/DisposableAssemblyLoadContext.cs
diff --git a/...s/DisposableAssemblyLoadContextFactory.cs → ...s/DisposableAssemblyLoadContextFactory.cs b/...s/DisposableAssemblyLoadContextFactory.cs → ...s/DisposableAssemblyLoadContextFactory.cs
diff --git a/...Services/FileProviderContentFileReader.cs → ...Services/FileProviderContentFileReader.cs b/...Services/FileProviderContentFileReader.cs → ...Services/FileProviderContentFileReader.cs
diff --git a/src/src/AssemblyLoader.Server/demo/LocalNugetVersion.props b/src/src/AssemblyLoader.Server/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/...blyLoader.Wasm/AssemblyLoader.Wasm.csproj → ...blyLoader.Wasm/AssemblyLoader.Wasm.csproj b/...blyLoader.Wasm/AssemblyLoader.Wasm.csproj → ...blyLoader.Wasm/AssemblyLoader.Wasm.csproj
diff --git a/.../Services/AppDomainAssemblyLoadContext.cs → .../Services/AppDomainAssemblyLoadContext.cs b/.../Services/AppDomainAssemblyLoadContext.cs → .../Services/AppDomainAssemblyLoadContext.cs
diff --git a/...es/AppDomainAssemblyLoadContextFactory.cs → ...es/AppDomainAssemblyLoadContextFactory.cs b/...es/AppDomainAssemblyLoadContextFactory.cs → ...es/AppDomainAssemblyLoadContextFactory.cs
diff --git a/...Wasm/Services/NetworkContentFileReader.cs → ...Wasm/Services/NetworkContentFileReader.cs b/...Wasm/Services/NetworkContentFileReader.cs → ...Wasm/Services/NetworkContentFileReader.cs
diff --git a/src/src/AssemblyLoader.Wasm/demo/LocalNugetVersion.props b/src/src/AssemblyLoader.Wasm/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/...ader/Abstractions/IAssemblyDataLocator.cs → ...ader/Abstractions/IAssemblyDataLocator.cs b/...ader/Abstractions/IAssemblyDataLocator.cs → ...ader/Abstractions/IAssemblyDataLocator.cs
diff --git a/...der/Abstractions/IAssemblyDataProvider.cs → ...der/Abstractions/IAssemblyDataProvider.cs b/...der/Abstractions/IAssemblyDataProvider.cs → ...der/Abstractions/IAssemblyDataProvider.cs
diff --git a/...ader/Abstractions/IAssemblyLoadContext.cs → ...ader/Abstractions/IAssemblyLoadContext.cs b/...ader/Abstractions/IAssemblyLoadContext.cs → ...ader/Abstractions/IAssemblyLoadContext.cs
diff --git a/...stractions/IAssemblyLoadContextFactory.cs → ...stractions/IAssemblyLoadContextFactory.cs b/...stractions/IAssemblyLoadContextFactory.cs → ...stractions/IAssemblyLoadContextFactory.cs
diff --git a/...blyLoader/Abstractions/IAssemblyLoader.cs → ...blyLoader/Abstractions/IAssemblyLoader.cs b/...blyLoader/Abstractions/IAssemblyLoader.cs → ...blyLoader/Abstractions/IAssemblyLoader.cs
diff --git a/...Loader/Abstractions/IContentFileReader.cs → ...Loader/Abstractions/IContentFileReader.cs b/...Loader/Abstractions/IContentFileReader.cs → ...Loader/Abstractions/IContentFileReader.cs
diff --git a/.../Abstractions/ILazyModuleHintsProvider.cs → .../Abstractions/ILazyModuleHintsProvider.cs b/.../Abstractions/ILazyModuleHintsProvider.cs → .../Abstractions/ILazyModuleHintsProvider.cs
diff --git a/src/AssemblyLoader/AssemblyLoader.csproj → src/src/AssemblyLoader/AssemblyLoader.csproj b/src/AssemblyLoader/AssemblyLoader.csproj → src/src/AssemblyLoader/AssemblyLoader.csproj
diff --git a/...arers/AssemblyByNameAndVersionComparer.cs → ...arers/AssemblyByNameAndVersionComparer.cs b/...arers/AssemblyByNameAndVersionComparer.cs → ...arers/AssemblyByNameAndVersionComparer.cs
diff --git a/...oader/Comparers/AssemblyByNameComparer.cs → ...oader/Comparers/AssemblyByNameComparer.cs b/...oader/Comparers/AssemblyByNameComparer.cs → ...oader/Comparers/AssemblyByNameComparer.cs
diff --git a/...mblyLoader/Comparers/IAssemblyComparer.cs → ...mblyLoader/Comparers/IAssemblyComparer.cs b/...mblyLoader/Comparers/IAssemblyComparer.cs → ...mblyLoader/Comparers/IAssemblyComparer.cs
diff --git a/...Loader/Extensions/EnumerableExtensions.cs → ...Loader/Extensions/EnumerableExtensions.cs b/...Loader/Extensions/EnumerableExtensions.cs → ...Loader/Extensions/EnumerableExtensions.cs
diff --git a/src/AssemblyLoader/Models/AssemblyData.cs → ...src/AssemblyLoader/Models/AssemblyData.cs b/src/AssemblyLoader/Models/AssemblyData.cs → ...src/AssemblyLoader/Models/AssemblyData.cs
diff --git a/...blyLoader/Models/AssemblyLoaderContext.cs → ...blyLoader/Models/AssemblyLoaderContext.cs b/...blyLoader/Models/AssemblyLoaderContext.cs → ...blyLoader/Models/AssemblyLoaderContext.cs
diff --git a/...blyLoader/Services/AssemblyDataLocator.cs → ...blyLoader/Services/AssemblyDataLocator.cs b/...blyLoader/Services/AssemblyDataLocator.cs → ...blyLoader/Services/AssemblyDataLocator.cs
diff --git a/...lyLoader/Services/AssemblyDataProvider.cs → ...lyLoader/Services/AssemblyDataProvider.cs b/...lyLoader/Services/AssemblyDataProvider.cs → ...lyLoader/Services/AssemblyDataProvider.cs
diff --git a/...AssemblyLoader/Services/AssemblyLoader.cs → ...AssemblyLoader/Services/AssemblyLoader.cs b/...AssemblyLoader/Services/AssemblyLoader.cs → ...AssemblyLoader/Services/AssemblyLoader.cs
diff --git a/...oader/Services/LazyModuleHintsProvider.cs → ...oader/Services/LazyModuleHintsProvider.cs b/...oader/Services/LazyModuleHintsProvider.cs → ...oader/Services/LazyModuleHintsProvider.cs
diff --git a/src/src/AssemblyLoader/demo/LocalNugetVersion.props b/src/src/AssemblyLoader/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/src/src/Directory.Build.props b/src/src/Directory.Build.props
@@ -0,0 +1,14 @@
+<Project>
+
+    <!--
+        Enable hierarchical 'Directory.Build.props'
+        This must be imported at the top of the file
+    -->
+    <Import
+        Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
+        Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
+
+    <!-- automatically create "Internal" packages -->
+    <Import Project="$(MSBuildThisFileDirectory)../nuget/NugetCommon.props" />
+
+</Project>
diff --git a/src/LazyComponents/LazyComponent/Lazy.cs → src/src/LazyComponents/LazyComponent/Lazy.cs b/src/LazyComponents/LazyComponent/Lazy.cs → src/src/LazyComponents/LazyComponent/Lazy.cs
diff --git a/...onents/LazyComponent/LazyNameAttribute.cs → ...onents/LazyComponent/LazyNameAttribute.cs b/...onents/LazyComponent/LazyNameAttribute.cs → ...onents/LazyComponent/LazyNameAttribute.cs
diff --git a/src/LazyComponents/LazyComponents.csproj → src/src/LazyComponents/LazyComponents.csproj b/src/LazyComponents/LazyComponents.csproj → src/src/LazyComponents/LazyComponents.csproj
diff --git a/.../Internals/OptionalTypeRouteConstraint.cs → .../Internals/OptionalTypeRouteConstraint.cs b/.../Internals/OptionalTypeRouteConstraint.cs → .../Internals/OptionalTypeRouteConstraint.cs
diff --git a/...ts/LazyRoute/Internals/RouteConstraint.cs → ...ts/LazyRoute/Internals/RouteConstraint.cs b/...ts/LazyRoute/Internals/RouteConstraint.cs → ...ts/LazyRoute/Internals/RouteConstraint.cs
diff --git a/...nents/LazyRoute/Internals/RouteContext.cs → ...nents/LazyRoute/Internals/RouteContext.cs b/...nents/LazyRoute/Internals/RouteContext.cs → ...nents/LazyRoute/Internals/RouteContext.cs
diff --git a/...ponents/LazyRoute/Internals/RouteEntry.cs → ...ponents/LazyRoute/Internals/RouteEntry.cs b/...ponents/LazyRoute/Internals/RouteEntry.cs → ...ponents/LazyRoute/Internals/RouteEntry.cs
diff --git a/...ponents/LazyRoute/Internals/RouteTable.cs → ...ponents/LazyRoute/Internals/RouteTable.cs b/...ponents/LazyRoute/Internals/RouteTable.cs → ...ponents/LazyRoute/Internals/RouteTable.cs
diff --git a/.../LazyRoute/Internals/RouteTableFactory.cs → .../LazyRoute/Internals/RouteTableFactory.cs b/.../LazyRoute/Internals/RouteTableFactory.cs → .../LazyRoute/Internals/RouteTableFactory.cs
diff --git a/...ents/LazyRoute/Internals/RouteTemplate.cs → ...ents/LazyRoute/Internals/RouteTemplate.cs b/...ents/LazyRoute/Internals/RouteTemplate.cs → ...ents/LazyRoute/Internals/RouteTemplate.cs
diff --git a/...nts/LazyRoute/Internals/TemplateParser.cs → ...nts/LazyRoute/Internals/TemplateParser.cs b/...nts/LazyRoute/Internals/TemplateParser.cs → ...nts/LazyRoute/Internals/TemplateParser.cs
diff --git a/...ts/LazyRoute/Internals/TemplateSegment.cs → ...ts/LazyRoute/Internals/TemplateSegment.cs b/...ts/LazyRoute/Internals/TemplateSegment.cs → ...ts/LazyRoute/Internals/TemplateSegment.cs
diff --git a/...azyRoute/Internals/TypeRouteConstraint.cs → ...azyRoute/Internals/TypeRouteConstraint.cs b/...azyRoute/Internals/TypeRouteConstraint.cs → ...azyRoute/Internals/TypeRouteConstraint.cs
diff --git a/src/LazyComponents/LazyRoute/LazyRouter.cs → ...rc/LazyComponents/LazyRoute/LazyRouter.cs b/src/LazyComponents/LazyRoute/LazyRouter.cs → ...rc/LazyComponents/LazyRoute/LazyRouter.cs
diff --git a/src/src/LazyComponents/demo/LocalNugetVersion.props b/src/src/LazyComponents/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/src/ManifestGenerator/GenerateManifest.cs → ...src/ManifestGenerator/GenerateManifest.cs b/src/ManifestGenerator/GenerateManifest.cs → ...src/ManifestGenerator/GenerateManifest.cs
diff --git a/src/ManifestGenerator/Logger.cs → src/src/ManifestGenerator/Logger.cs b/src/ManifestGenerator/Logger.cs → src/src/ManifestGenerator/Logger.cs
diff --git a/...anifestGenerator/ManifestGenerator.csproj → ...anifestGenerator/ManifestGenerator.csproj b/...anifestGenerator/ManifestGenerator.csproj → ...anifestGenerator/ManifestGenerator.csproj
diff --git a/...tGenerators/ComponentManifestGenerator.cs → ...tGenerators/ComponentManifestGenerator.cs b/...tGenerators/ComponentManifestGenerator.cs → ...tGenerators/ComponentManifestGenerator.cs
diff --git a/.../ManifestGenerators/IManifestGenerator.cs → .../ManifestGenerators/IManifestGenerator.cs b/.../ManifestGenerators/IManifestGenerator.cs → .../ManifestGenerators/IManifestGenerator.cs
diff --git a/...ifestGenerators/RouteManifestGenerator.cs → ...ifestGenerators/RouteManifestGenerator.cs b/...ifestGenerators/RouteManifestGenerator.cs → ...ifestGenerators/RouteManifestGenerator.cs
diff --git a/src/src/ManifestGenerator/demo/LocalNugetVersion.props b/src/src/ManifestGenerator/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>
diff --git a/...stReader/Abstractions/IManifestLocator.cs → ...stReader/Abstractions/IManifestLocator.cs b/...stReader/Abstractions/IManifestLocator.cs → ...stReader/Abstractions/IManifestLocator.cs
diff --git a/...eader/Abstractions/IManifestRepository.cs → ...eader/Abstractions/IManifestRepository.cs b/...eader/Abstractions/IManifestRepository.cs → ...eader/Abstractions/IManifestRepository.cs
diff --git a/src/ManifestReader/ManifestReader.csproj → src/src/ManifestReader/ManifestReader.csproj b/src/ManifestReader/ManifestReader.csproj → src/src/ManifestReader/ManifestReader.csproj
diff --git a/src/ManifestReader/Models/ModuleManifest.cs → ...c/ManifestReader/Models/ModuleManifest.cs b/src/ManifestReader/Models/ModuleManifest.cs → ...c/ManifestReader/Models/ModuleManifest.cs
diff --git a/...anifestReader/Services/ManifestLocator.cs → ...anifestReader/Services/ManifestLocator.cs b/...anifestReader/Services/ManifestLocator.cs → ...anifestReader/Services/ManifestLocator.cs
diff --git a/...festReader/Services/ManifestRepository.cs → ...festReader/Services/ManifestRepository.cs b/...festReader/Services/ManifestRepository.cs → ...festReader/Services/ManifestRepository.cs
diff --git a/src/src/ManifestReader/demo/LocalNugetVersion.props b/src/src/ManifestReader/demo/LocalNugetVersion.props
@@ -0,0 +1,7 @@
+<!-- Autogenerated -->
+<!-- Please build 'BlazorLazyLoading.sln' first -->
+<Project>
+<PropertyGroup>
+<BLLVersion>1.1.1-cleanup-src.1+2</BLLVersion>
+</PropertyGroup>
+</Project>