Merge pull request #213 from Daddoon/dev

Dev
Daddoon · Jun 5, 2020 · ec3d6e4 · ec3d6e4
2 parents 4efa1cd + b4295b5
commit ec3d6e4
Show file tree

Hide file tree

Showing 19 changed files with 66 additions and 28 deletions.
diff --git a/MIGRATION.md b/MIGRATION.md
@@ -1,6 +1,7 @@
 
 # Migration
 
+- [BlazorMobile 3.2.7-preview4.20210.8 to 3.2.8](#blazormobile-327-preview4202108-to-328)
 - [BlazorMobile 3.2.5-preview3.20168.3 to 3.2.7-preview4.20210.8](#blazormobile-325-preview3201683-to-327-preview4202108)
 - [BlazorMobile 3.2.4-preview2.20160.5 to 3.2.5-preview3.20168.3](#blazormobile-324-preview2201605-to-325-preview3201683)
 - [BlazorMobile 3.2.3-preview2.20160.5 to 3.2.4-preview2.20160.5](#blazormobile-323-preview2201605-to-324-preview2201605)
@@ -1435,4 +1436,26 @@ dotnet new -i BlazorMobile.Templates::3.2.7-preview4.20210.8
     <script type="text/javascript" src="_framework/blazor.webassembly.js"></script>
 </body> 
 </html>
-```
+```
+
+### BlazorMobile 3.2.7-preview4.20210.8 to 3.2.8
+
+#### Release notes:
+
+- Fix **Could not load file or assembly 'BlazorMobile.Common, Version=3.2.7.0, Culture=neutral, PublicKeyToken=null'. The located assembly's manifest definition does not match the assembly reference. (0x80131040)'** error on .NET Core / Server's project at startup.
+- Updated Blazor version to **3.2.0**
+
+#### Migration guide:
+
+- Update your Blazor project version to Blazor 3.2.0 by follow theses guides, if you upgrade from 3.2.4-preview4:
+  - [Blazor 3.2.0-preview5](https://devblogs.microsoft.com/aspnet/blazor-webassembly-3-2-0-preview-5-release-now-available/)
+  - [Blazor 3.2.0-RC](https://devblogs.microsoft.com/aspnet/blazor-webassembly-3-2-0-release-candidate-now-available/)
+  - [Blazor 3.2.0](https://devblogs.microsoft.com/aspnet/blazor-webassembly-3-2-0-now-available/)
+
+- Update your installed BlazorMobile.Templates to this version by calling:
+
+```console
+dotnet new -i BlazorMobile.Templates::3.2.8
+```
+
+- Update all your BlazorMobile.* NuGet packages to **3.2.8**.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Create full C# driven hybrid-apps for iOS, Android, UWP & Desktop with Blazor!
 ## Framework requirement
 
 
-- **Blazor 3.2.0-preview4.20210.8**
+- **Blazor 3.2.0**
 - **.NET Core 3.1**
 
 ## Platform requirements
@@ -84,7 +84,7 @@ The main differences / advantages of BlazorMobile are:
 First install the template model with the following command from a command prompt:
 
 ```console
-dotnet new -i BlazorMobile.Templates::3.2.7-preview4.20210.8
+dotnet new -i BlazorMobile.Templates::3.2.8
 ```
 
 Then go the folder where you want your project to be created, and from a command prompt type the following command, and of course replace **MyProjectName** to your desired project name:

diff --git a/src/BlazorMobile.Build/BlazorMobile.Build.nuspec b/src/BlazorMobile.Build/BlazorMobile.Build.nuspec
@@ -15,7 +15,7 @@
     <copyright>Copyright 2020</copyright>
     <tags>Blazor BlazorMobile Xamarin iOS Android Hybrid</tags>
     <dependencies>
-      <dependency id="Microsoft.AspNetCore.Components.WebAssembly.Build" version="3.2.0-preview3.20168.3" include="all" />
+      <dependency id="Microsoft.AspNetCore.Components.WebAssembly.Build" version="3.2.0" include="all" />
     </dependencies>
   </metadata>
   <files>

diff --git a/src/BlazorMobile.Common/BlazorMobile.Common.csproj b/src/BlazorMobile.Common/BlazorMobile.Common.csproj
@@ -4,6 +4,14 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>BlazorMobile.Common</RootNamespace>
     <AssemblyName>BlazorMobile.Common</AssemblyName>
+    <Authors>Guillaume ZAHRA</Authors>
+    <Company>Daddoon</Company>
+    <Copyright>Copyright 2020</Copyright>
+    <PackageProjectUrl>https://github.com/Daddoon/BlazorMobile</PackageProjectUrl>
+    <PackageIcon>logo_blazormobile_256x256.png</PackageIcon>
+    <PackageReleaseNotes>See release notes on BlazorMobile project page</PackageReleaseNotes>
+    <PackageTags>aspnet templates blazor spa web webassembly xamarin android ios uwp</PackageTags>
+    <Description>This package is used by BlazorMobile, BlazorMobile.Web &amp; BlazorMobile.ElectronNET. You don't have to reference it directly.</Description>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -44,4 +52,11 @@
     <Folder Include="Interop\Javascript\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\..\logo_blazormobile_256x256.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/src/BlazorMobile.InteropApp.Android/BlazorMobile.InteropApp.Android.csproj b/src/BlazorMobile.InteropApp.Android/BlazorMobile.InteropApp.Android.csproj
@@ -59,7 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BlazorMobile.Build.Android">
-      <Version>3.2.7-preview4.20210.8</Version>
+      <Version>3.2.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Blazor">
       <Version>3.2.0-preview1.20073.1</Version>

diff --git a/src/BlazorMobile.InteropApp.Desktop/BlazorMobile.InteropApp.Desktop.csproj b/src/BlazorMobile.InteropApp.Desktop/BlazorMobile.InteropApp.Desktop.csproj
@@ -10,7 +10,7 @@
     <None Remove="wwwroot\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BlazorMobile.Build.ElectronNET" Version="3.2.7-preview4.20210.8" />
+    <PackageReference Include="BlazorMobile.Build.ElectronNET" Version="3.2.8" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview4.20210.8" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.7.4">

diff --git a/src/BlazorMobile.InteropBlazorApp.AnotherApp/BlazorMobile.InteropBlazorApp.AnotherApp.csproj b/src/BlazorMobile.InteropBlazorApp.AnotherApp/BlazorMobile.InteropBlazorApp.AnotherApp.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorMobile.Build" Version="3.2.7-preview4.20210.8" />
+    <PackageReference Include="BlazorMobile.Build" Version="3.2.8" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview4.20210.8" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />

diff --git a/src/BlazorMobile.InteropBlazorApp/BlazorMobile.InteropBlazorApp.csproj b/src/BlazorMobile.InteropBlazorApp/BlazorMobile.InteropBlazorApp.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorMobile.Build" Version="3.2.7-preview4.20210.8" />
+    <PackageReference Include="BlazorMobile.Build" Version="3.2.8" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview4.20210.8" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
 	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />

diff --git a/src/BlazorMobile.NuGet/BlazorMobile.NuGet.csproj b/src/BlazorMobile.NuGet/BlazorMobile.NuGet.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="set nugetVersion=3.2.7-preview4.20210.8&#xD;&#xA;echo NuGet artifact version is: %25nugetVersion%25&#xD;&#xA;&#xD;&#xA;nuget pack .\..\BlazorMobile\BlazorMobile.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;nuget pack .\..\BlazorMobile\BlazorMobile.Common.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;&#xD;&#xA;dotnet pack .\..\BlazorMobile.Web\BlazorMobile.Web.csproj -c $(ConfigurationName) /p:Version=%25nugetVersion%25 -o .\artifacts&#xD;&#xA;&#xD;&#xA;nuget pack .\..\BlazorMobile\BlazorMobile.ElectronNET.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;nuget pack .\..\BlazorMobile.Build\BlazorMobile.Build.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;nuget pack .\..\BlazorMobile.Build.ElectronNET\BlazorMobile.Build.ElectronNET.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;nuget pack .\..\BlazorMobile.Build.Android\BlazorMobile.Build.Android.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;&#xD;&#xA;cd .\..\BlazorMobile.Templates\content&#xD;&#xA;&#xD;&#xA;FOR /d /r . %25%25d IN (bin) DO @IF EXIST &quot;%25%25d&quot; rd /s /q &quot;%25%25d&quot;&#xD;&#xA;FOR /d /r . %25%25d IN (_bin) DO @IF EXIST &quot;%25%25d&quot; rd /s /q &quot;%25%25d&quot;&#xD;&#xA;FOR /d /r . %25%25d IN (obj) DO @IF EXIST &quot;%25%25d&quot; rd /s /q &quot;%25%25d&quot;&#xD;&#xA;&#xD;&#xA;cd .\..\..\BlazorMobile.NuGet&#xD;&#xA;&#xD;&#xA;nuget pack .\..\BlazorMobile.Templates\BlazorMobile.Templates.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts" />
+    <Exec Command="set nugetVersion=3.2.8&#xD;&#xA;echo NuGet artifact version is: %25nugetVersion%25&#xD;&#xA;&#xD;&#xA;nuget pack .\..\BlazorMobile\BlazorMobile.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;dotnet pack .\..\BlazorMobile.Common\BlazorMobile.Common.csproj -c $(ConfigurationName) /p:Version=%25nugetVersion%25 -o .\artifacts&#xD;&#xA;dotnet pack .\..\BlazorMobile.Web\BlazorMobile.Web.csproj -c $(ConfigurationName) /p:Version=%25nugetVersion%25 -o .\artifacts&#xD;&#xA;&#xD;&#xA;nuget pack .\..\BlazorMobile\BlazorMobile.ElectronNET.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;nuget pack .\..\BlazorMobile.Build\BlazorMobile.Build.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;nuget pack .\..\BlazorMobile.Build.ElectronNET\BlazorMobile.Build.ElectronNET.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;nuget pack .\..\BlazorMobile.Build.Android\BlazorMobile.Build.Android.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts&#xD;&#xA;&#xD;&#xA;cd .\..\BlazorMobile.Templates\content&#xD;&#xA;&#xD;&#xA;FOR /d /r . %25%25d IN (bin) DO @IF EXIST &quot;%25%25d&quot; rd /s /q &quot;%25%25d&quot;&#xD;&#xA;FOR /d /r . %25%25d IN (_bin) DO @IF EXIST &quot;%25%25d&quot; rd /s /q &quot;%25%25d&quot;&#xD;&#xA;FOR /d /r . %25%25d IN (obj) DO @IF EXIST &quot;%25%25d&quot; rd /s /q &quot;%25%25d&quot;&#xD;&#xA;&#xD;&#xA;cd .\..\..\BlazorMobile.NuGet&#xD;&#xA;&#xD;&#xA;nuget pack .\..\BlazorMobile.Templates\BlazorMobile.Templates.nuspec -Version &quot;%25nugetVersion%25&quot; -OutputDirectory .\artifacts" />
   </Target>
 
 </Project>
diff --git a/...ontent/BlazorMobile.Sample/BlazorMobile.Sample.Android/BlazorMobile.Sample.Android.csproj b/...ontent/BlazorMobile.Sample/BlazorMobile.Sample.Android/BlazorMobile.Sample.Android.csproj
@@ -59,10 +59,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BlazorMobile">
-      <Version>3.2.7-preview4.20210.8</Version>
+      <Version>3.2.8</Version>
     </PackageReference>
     <PackageReference Include="BlazorMobile.Build.Android">
-      <Version>3.2.7-preview4.20210.8</Version>
+      <Version>3.2.8</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Android.Support.CustomTabs">
       <Version>28.0.0.3</Version>

diff --git a/...rMobile.Sample/BlazorMobile.Sample.Blazor.Server/BlazorMobile.Sample.Blazor.Server.csproj b/...rMobile.Sample/BlazorMobile.Sample.Blazor.Server/BlazorMobile.Sample.Blazor.Server.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
    <ItemGroup>
-    <PackageReference Include="BlazorMobile.Web" Version="3.2.7-preview4.20210.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview4.20210.8" />
+    <PackageReference Include="BlazorMobile.Web" Version="3.2.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
   </ItemGroup>
 

diff --git a/.../content/BlazorMobile.Sample/BlazorMobile.Sample.Blazor/BlazorMobile.Sample.Blazor.csproj b/.../content/BlazorMobile.Sample/BlazorMobile.Sample.Blazor/BlazorMobile.Sample.Blazor.csproj
@@ -21,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorMobile.Build" Version="3.2.7-preview4.20210.8" />
-    <PackageReference Include="BlazorMobile.Web" Version="3.2.7-preview4.20210.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview4.20210.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
-	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
-	  <PackageReference Include="System.Net.Http.Json" Version="3.2.0-preview5.20210.3" />
+    <PackageReference Include="BlazorMobile.Build" Version="3.2.8" />
+    <PackageReference Include="BlazorMobile.Web" Version="3.2.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
+	  <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
+	  <PackageReference Include="System.Net.Http.Json" Version="3.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.2" />
   </ItemGroup>
 

diff --git a/.../content/BlazorMobile.Sample/BlazorMobile.Sample.Common/BlazorMobile.Sample.Common.csproj b/.../content/BlazorMobile.Sample/BlazorMobile.Sample.Common/BlazorMobile.Sample.Common.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorMobile.Common" Version="3.2.7-preview4.20210.8" />
+    <PackageReference Include="BlazorMobile.Common" Version="3.2.8" />
   </ItemGroup>
 
 </Project>
diff --git a/...ontent/BlazorMobile.Sample/BlazorMobile.Sample.Desktop/BlazorMobile.Sample.Desktop.csproj b/...ontent/BlazorMobile.Sample/BlazorMobile.Sample.Desktop/BlazorMobile.Sample.Desktop.csproj
@@ -10,9 +10,9 @@
     <None Remove="wwwroot\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BlazorMobile.Build.ElectronNET" Version="3.2.7-preview4.20210.8" />
-    <PackageReference Include="BlazorMobile.ElectronNET" Version="3.2.7-preview4.20210.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview4.20210.8" />
+    <PackageReference Include="BlazorMobile.Build.ElectronNET" Version="3.2.8" />
+    <PackageReference Include="BlazorMobile.ElectronNET" Version="3.2.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
     <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.7.4">
       <PrivateAssets>all</PrivateAssets>

diff --git a/...plates/content/BlazorMobile.Sample/BlazorMobile.Sample.UWP/BlazorMobile.Sample.UWP.csproj b/...plates/content/BlazorMobile.Sample/BlazorMobile.Sample.UWP/BlazorMobile.Sample.UWP.csproj
@@ -154,7 +154,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BlazorMobile">
-      <Version>3.2.7-preview4.20210.8</Version>
+      <Version>3.2.8</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms" Version="3.5.0.169047" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />

diff --git a/...plates/content/BlazorMobile.Sample/BlazorMobile.Sample.iOS/BlazorMobile.Sample.iOS.csproj b/...plates/content/BlazorMobile.Sample/BlazorMobile.Sample.iOS/BlazorMobile.Sample.iOS.csproj
@@ -150,7 +150,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BlazorMobile">
-      <Version>3.2.7-preview4.20210.8</Version>
+      <Version>3.2.8</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Forms" Version="3.5.0.169047" />
   </ItemGroup>

diff --git a/...bile.Templates/content/BlazorMobile.Sample/BlazorMobile.Sample/BlazorMobile.Sample.csproj b/...bile.Templates/content/BlazorMobile.Sample/BlazorMobile.Sample/BlazorMobile.Sample.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BlazorMobile" Version="3.2.7-preview4.20210.8" />
+    <PackageReference Include="BlazorMobile" Version="3.2.8" />
     <PackageReference Include="Xamarin.Forms" Version="3.5.0.169047" />
   </ItemGroup>
 

diff --git a/src/BlazorMobile.Web/BlazorMobile.Web.csproj b/src/BlazorMobile.Web/BlazorMobile.Web.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview4.20210.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.3" />
   </ItemGroup>

diff --git a/src/BlazorMobile/BlazorMobile.Web.nuspec b/src/BlazorMobile/BlazorMobile.Web.nuspec
@@ -16,7 +16,7 @@
         <tags>aspnet templates blazor spa web webassembly xamarin android ios uwp</tags>
         <dependencies>
             <group targetFramework="netstandard2.1">
-                <dependency id="Microsoft.AspNetCore.Components.WebAssembly" version="3.2.0-preview3.20168.3" />
+                <dependency id="Microsoft.AspNetCore.Components.WebAssembly" version="3.2.0" />
                 <dependency id="BlazorMobile.Common" version="$version$" />
             </group>
         </dependencies>