diff --git a/Cortex.Net.sln b/Cortex.Net.sln
index 9103935..594fccf 100644
--- a/Cortex.Net.sln
+++ b/Cortex.Net.sln
@@ -31,6 +31,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{79D4
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cortex.Net.BlazorTodo", "samples\Cortex.Net.BlazorTodo\Cortex.Net.BlazorTodo.csproj", "{A9CA7C47-8A56-4BBC-B943-6BE37D1BAE3F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8F1E2084-FEBE-462B-8F92-9644FB7577AE}"
+	ProjectSection(SolutionItems) = preProject
+		build\build.props = build\build.props
+		build\Weaver.props = build\Weaver.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/LICENSE b/LICENSE.txt
similarity index 100%
rename from LICENSE
rename to LICENSE.txt
diff --git a/build/Weaver.props b/build/Weaver.props
new file mode 100644
index 0000000..9c70439
--- /dev/null
+++ b/build/Weaver.props
@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <WeaverFiles Include="$(MsBuildThisFileDirectory)..\weaver\$(MSBuildThisFileName).Fody.dll" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/build/build.props b/build/build.props
index 6a6f836..304200c 100644
--- a/build/build.props
+++ b/build/build.props
@@ -1,9 +1,19 @@
 <Project>
-    <PropertyGroup>
-        <Description>IL-instrumentation based observables</Description>
-        <Authors>Jan-Willem Spuij</Authors>
-        <PackageLicenseUrl>https://github.com/jspuij/Cortex.Net/blob/master/LICENSE</PackageLicenseUrl>
-        <PackageProjectUrl>https://github.com/jspuij/Cortex.Net</PackageProjectUrl>
-        <DisableFody>true</DisableFody>
-       </PropertyGroup>
+  <PropertyGroup>
+    <PackageId Condition="'$(PackageId)' == ''">$(MSBuildProjectName)</PackageId>
+    <Description>Transparent Reactive State Management for .NET applications.</Description>
+    <Authors>Jan-Willem Spuij</Authors>
+    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/jspuij/Cortex.Net</PackageProjectUrl>
+    <DisableFody>true</DisableFody>
+    <Version>0.1.0-preview</Version>
+    <NeutralLanguage>en-US</NeutralLanguage>
+</PropertyGroup>
+
+  <ItemGroup>
+    <None Include="$(SolutionDir)LICENSE.txt">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Cortex.Net.Blazor/Cortex.Net.Blazor.csproj b/src/Cortex.Net.Blazor/Cortex.Net.Blazor.csproj
index 778ed56..febb077 100644
--- a/src/Cortex.Net.Blazor/Cortex.Net.Blazor.csproj
+++ b/src/Cortex.Net.Blazor/Cortex.Net.Blazor.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/Cortex.Net/Cortex.Net.csproj b/src/Cortex.Net/Cortex.Net.csproj
index efc52fb..33fde98 100644
--- a/src/Cortex.Net/Cortex.Net.csproj
+++ b/src/Cortex.Net/Cortex.Net.csproj
@@ -1,8 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\build\build.props" />
 
   <PropertyGroup>
+    <NoWarn>$(NoWarn);NU5100</NoWarn>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <NeutralLanguage>en</NeutralLanguage>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <WeaverDirPath Condition="'$(WeaverDirPath)' == ''">$(SolutionDir)src\$(PackageId).Fody\bin\$(Configuration)\</WeaverDirPath>
+    <WeaverPropsFile Condition="'$(WeaverPropsFile)' == ''">$(SolutionDir)build\Weaver.props</WeaverPropsFile>
+    <TargetsForTfmSpecificContentInPackage Condition="'$(SkipPackagingDefaultFiles)' != 'true'">$(TargetsForTfmSpecificContentInPackage);IncludeFodyFiles</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -18,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.0.5" PrivateAssets="None" />
+    <PackageReference Include="Fody" Version="[6.0.0>" PrivateAssets="None" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -65,5 +70,24 @@
   <ItemGroup>
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
   </ItemGroup>
-  <Import Project="..\..\build\build.props"/>
+  
+  <Target Name="IncludeFodyFiles">
+    <PropertyGroup>
+      <WeaverFile>$(WeaverDirPath)netstandard2.0\$(PackageId).Fody.dll</WeaverFile>
+      <XcfFile>$(WeaverDirPath)netstandard2.0\$(PackageId).Fody.xcf</XcfFile>
+    </PropertyGroup>
+
+    <Error Text="FodyPackaging: No weaver found at $(WeaverFile). $(ProjectName) should have a Project Dependency on $(PackageId), and $(PackageId) should target 'netstandard2.0'."
+           Condition="!Exists($(WeaverFile))" />
+
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="$(XcfFile)"
+                              PackagePath="weaver\$(PackageId).Fody.xcf"
+                              Condition="Exists($(XcfFile))" />
+      <TfmSpecificPackageFile Include="$(WeaverFile)"
+                              PackagePath="weaver\$(PackageId).Fody.dll" />
+      <TfmSpecificPackageFile Include="$(WeaverPropsFile)"
+                              PackagePath="build\$(PackageId).props" />
+    </ItemGroup>
+  </Target>
 </Project>