Skip to content
This repository has been archived by the owner on Dec 17, 2021. It is now read-only.

Commit

Permalink
Merge pull request #207 from Daddoon/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Daddoon authored May 4, 2020
2 parents f73bc35 + 36628b7 commit 4efa1cd
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 21 deletions.
8 changes: 4 additions & 4 deletions MIGRATION.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Migration

- [BlazorMobile 3.2.5-preview3.20168.3 to 3.2.6-preview4.20210.8](#blazormobile-325-preview3201683-to-326-preview4202108)
- [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)
- [BlazorMobile 3.2.2-preview1.20073.1 to 3.2.3-preview2.20160.5](#blazormobile-322-preview1200731-to-323-preview2201605)
Expand Down Expand Up @@ -1395,7 +1395,7 @@ dotnet new -i BlazorMobile.Templates::3.2.5-preview3.20168.3

- Add the **BlazorMobile.Build.ElectronNET** NuGet package to the **.Desktop** project. This workaround / fix a publishing issue since some recent updates, preventing Desktop project to boot correctly.

### BlazorMobile 3.2.5-preview3.20168.3 to 3.2.6-preview4.20210.8
### BlazorMobile 3.2.5-preview3.20168.3 to 3.2.7-preview4.20210.8

#### Migration guide:

Expand All @@ -1404,10 +1404,10 @@ dotnet new -i BlazorMobile.Templates::3.2.5-preview3.20168.3
- Update your installed BlazorMobile.Templates to this version by calling:

```console
dotnet new -i BlazorMobile.Templates::3.2.6-preview4.20210.8
dotnet new -i BlazorMobile.Templates::3.2.7-preview4.20210.8
```

- Update all your BlazorMobile.* NuGet packages to **3.2.6-preview4.20210.8**.
- Update all your BlazorMobile.* NuGet packages to **3.2.7-preview4.20210.8**.

- Open the **index.html** file of your Blazor project and add the following line before the **blazor.webassembly.js** line:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.6-preview4.20210.8
dotnet new -i BlazorMobile.Templates::3.2.7-preview4.20210.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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BlazorMobile.Build.Android">
<Version>3.2.6-preview4.20210.8</Version>
<Version>3.2.7-preview4.20210.8</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Blazor">
<Version>3.2.0-preview1.20073.1</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<None Remove="wwwroot\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BlazorMobile.Build.ElectronNET" Version="3.2.6-preview4.20210.8" />
<PackageReference Include="BlazorMobile.Build.ElectronNET" Version="3.2.7-preview4.20210.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">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BlazorMobile.Build" Version="3.2.6-preview4.20210.8" />
<PackageReference Include="BlazorMobile.Build" 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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BlazorMobile.Build" Version="3.2.6-preview4.20210.8" />
<PackageReference Include="BlazorMobile.Build" 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" />
Expand Down
2 changes: 1 addition & 1 deletion src/BlazorMobile.NuGet/BlazorMobile.NuGet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="set nugetVersion=3.2.6-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.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" />
</Target>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BlazorMobile">
<Version>3.2.6-preview4.20210.8</Version>
<Version>3.2.7-preview4.20210.8</Version>
</PackageReference>
<PackageReference Include="BlazorMobile.Build.Android">
<Version>3.2.6-preview4.20210.8</Version>
<Version>3.2.7-preview4.20210.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.CustomTabs">
<Version>28.0.0.3</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BlazorMobile.Web" Version="3.2.6-preview4.20210.8" />
<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="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BlazorMobile.Build" Version="3.2.6-preview4.20210.8" />
<PackageReference Include="BlazorMobile.Web" Version="3.2.6-preview4.20210.8" />
<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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BlazorMobile.Common" Version="3.2.6-preview4.20210.8" />
<PackageReference Include="BlazorMobile.Common" Version="3.2.7-preview4.20210.8" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<None Remove="wwwroot\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BlazorMobile.Build.ElectronNET" Version="3.2.6-preview4.20210.8" />
<PackageReference Include="BlazorMobile.ElectronNET" Version="3.2.6-preview4.20210.8" />
<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="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.TypeScript.MSBuild" Version="3.7.4">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BlazorMobile">
<Version>3.2.6-preview4.20210.8</Version>
<Version>3.2.7-preview4.20210.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="3.5.0.169047" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BlazorMobile">
<Version>3.2.6-preview4.20210.8</Version>
<Version>3.2.7-preview4.20210.8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="3.5.0.169047" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BlazorMobile" Version="3.2.6-preview4.20210.8" />
<PackageReference Include="BlazorMobile" Version="3.2.7-preview4.20210.8" />
<PackageReference Include="Xamarin.Forms" Version="3.5.0.169047" />
</ItemGroup>

Expand Down

0 comments on commit 4efa1cd

Please sign in to comment.