New beta version 8 (#459)

Softeq · Nov 25, 2021 · 7e2bdb0 · 7e2bdb0
1 parent f75503b
commit 7e2bdb0
Show file tree

Hide file tree

Showing 30 changed files with 323 additions and 137 deletions.
diff --git a/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj b/Softeq.XToolkit.Bindings.Droid/Softeq.XToolkit.Bindings.Droid.csproj
@@ -78,5 +78,6 @@
       <Name>Softeq.XToolkit.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj b/Softeq.XToolkit.Bindings.iOS/Softeq.XToolkit.Bindings.iOS.csproj
@@ -78,5 +78,6 @@
       <Name>Softeq.XToolkit.Common.iOS</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/Softeq.XToolkit.Bindings/Softeq.XToolkit.Bindings.csproj b/Softeq.XToolkit.Bindings/Softeq.XToolkit.Bindings.csproj
@@ -8,4 +8,6 @@
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
+
 </Project>
diff --git a/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj b/Softeq.XToolkit.Permissions.Droid/Softeq.XToolkit.Permissions.Droid.csproj
@@ -63,5 +63,6 @@
       <Name>Softeq.XToolkit.Permissions</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/Softeq.XToolkit.Permissions.iOS/Softeq.XToolkit.Permissions.iOS.csproj b/Softeq.XToolkit.Permissions.iOS/Softeq.XToolkit.Permissions.iOS.csproj
@@ -65,5 +65,6 @@
             <Name>Softeq.XToolkit.Permissions</Name>
         </ProjectReference>
     </ItemGroup>
+    <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/Softeq.XToolkit.Permissions/Softeq.XToolkit.Permissions.csproj b/Softeq.XToolkit.Permissions/Softeq.XToolkit.Permissions.csproj
@@ -8,4 +8,6 @@
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
+
 </Project>
diff --git a/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj b/Softeq.XToolkit.PushNotifications.Droid/Softeq.XToolkit.PushNotifications.Droid.csproj
@@ -72,12 +72,6 @@
       <Name>Softeq.XToolkit.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/Softeq.XToolkit.PushNotifications.iOS/Softeq.XToolkit.PushNotifications.iOS.csproj b/Softeq.XToolkit.PushNotifications.iOS/Softeq.XToolkit.PushNotifications.iOS.csproj
@@ -59,5 +59,6 @@
       <Name>Softeq.XToolkit.Common</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/Softeq.XToolkit.PushNotifications/Softeq.XToolkit.PushNotifications.csproj b/Softeq.XToolkit.PushNotifications/Softeq.XToolkit.PushNotifications.csproj
@@ -8,4 +8,6 @@
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
+
 </Project>
diff --git a/Softeq.XToolkit.Remote/Softeq.XToolkit.Remote.csproj b/Softeq.XToolkit.Remote/Softeq.XToolkit.Remote.csproj
@@ -5,12 +5,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Polly" Version="7.2.1" />
+    <PackageReference Include="Polly" Version="7.2.2" />
     <PackageReference Include="refit" Version="5.2.4" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
+
 </Project>
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj b/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj
@@ -142,5 +142,6 @@
     <AndroidResource Include="Resources\layout\control_notification_badge.xml" />
     <AndroidResource Include="Resources\drawable\core_badge_background.xml" />
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/...q.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj b/...q.XToolkit.WhiteLabel.Essentials.Droid/Softeq.XToolkit.WhiteLabel.Essentials.Droid.csproj
@@ -88,5 +88,6 @@
     <ItemGroup>
       <PackageReference Include="Xamarin.FFImageLoading" Version="2.4.11.982" />
     </ItemGroup>
+    <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/Softeq.XToolkit.WhiteLabel.Essentials.iOS/Softeq.XToolkit.WhiteLabel.Essentials.iOS.csproj b/Softeq.XToolkit.WhiteLabel.Essentials.iOS/Softeq.XToolkit.WhiteLabel.Essentials.iOS.csproj
@@ -85,5 +85,6 @@
     <ItemGroup>
       <InterfaceDefinition Include="FullScreenImage\FullScreenImageStoryboard.storyboard" />
     </ItemGroup>
+    <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
     <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/Softeq.XToolkit.WhiteLabel.Essentials/Softeq.XToolkit.WhiteLabel.Essentials.csproj b/Softeq.XToolkit.WhiteLabel.Essentials/Softeq.XToolkit.WhiteLabel.Essentials.csproj
@@ -1,12 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Softeq.XToolkit.Permissions\Softeq.XToolkit.Permissions.csproj" />
-      <ProjectReference Include="..\Softeq.XToolkit.WhiteLabel\Softeq.XToolkit.WhiteLabel.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Softeq.XToolkit.Permissions\Softeq.XToolkit.Permissions.csproj" />
+    <ProjectReference Include="..\Softeq.XToolkit.WhiteLabel\Softeq.XToolkit.WhiteLabel.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
 
 </Project>
diff --git a/Softeq.XToolkit.WhiteLabel.Forms/Softeq.XToolkit.WhiteLabel.Forms.csproj b/Softeq.XToolkit.WhiteLabel.Forms/Softeq.XToolkit.WhiteLabel.Forms.csproj
@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netstandard2.1</TargetFramework>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\Softeq.XToolkit.WhiteLabel\Softeq.XToolkit.WhiteLabel.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Softeq.XToolkit.WhiteLabel\Softeq.XToolkit.WhiteLabel.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
 
 </Project>
diff --git a/Softeq.XToolkit.WhiteLabel.iOS/Softeq.XToolkit.WhiteLabel.iOS.csproj b/Softeq.XToolkit.WhiteLabel.iOS/Softeq.XToolkit.WhiteLabel.iOS.csproj
@@ -32,9 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
-    <PackageReference Include="Xamarin.FFImageLoading">
-      <Version>2.4.11.982</Version>
-    </PackageReference>
+    <PackageReference Include="Xamarin.FFImageLoading" Version="2.4.11.982" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -110,5 +108,6 @@
       <Name>Softeq.XToolkit.Common.iOS</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
diff --git a/Softeq.XToolkit.WhiteLabel/Softeq.XToolkit.WhiteLabel.csproj b/Softeq.XToolkit.WhiteLabel/Softeq.XToolkit.WhiteLabel.csproj
@@ -5,13 +5,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="DryIoc.dll" Version="4.5.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Softeq.XToolkit.Common\Softeq.XToolkit.Common.csproj" />
   </ItemGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)..\NuGet.targets" />
+
 </Project>
diff --git a/documentation/articles/contributing-documentation.md b/documentation/articles/contributing-documentation.md
@@ -61,7 +61,6 @@ XToolkit types:
 <see cref="AsyncCommand"/>
 ```
 
-
 ## Build documentation locally
 
 In some cases it might be more comfortable to work locally on updating the documentation pages instead of using the online GitHub editor. This is especially the case when working on bigger changes you’d most likely do on a separate branch and maybe spend multiple days working on. In those cases it might be usefull to be able to generate the site locally, so you can see what your changes look like when rendered in the browser. This means you will have to follow these steps:
@@ -70,7 +69,6 @@ In some cases it might be more comfortable to work locally on updating the docum
 2. Build documentation via `cd documentation && ./build.sh`
 3. Open `documentation/_site/index.html` in browser
 
-
 ## Summary
 
 This style guide is intended to help contributors quickly create new articles for https://softeq.github.io/XToolkit.WhiteLabel/. It includes the most common syntax elements that are used, as well as overall document organization guidance. If you discover mistakes or gaps in this guide, please submit an issue.

diff --git a/documentation/articles/nuget-release-process.md b/documentation/articles/nuget-release-process.md
@@ -0,0 +1,48 @@
+# NuGet Release Process
+
+## Development
+
+- Internal members:
+  - Checkout from master
+- External members:
+  - Clone repository
+- Create PR to the `master` branch
+
+## Release XToolkit components
+
+- Create `release/beta4` branch
+- [Compare changes](https://github.com/Softeq/XToolkit.WhiteLabel/compare) (last tag <- master):
+- Update all `nuget/*.nuspec` (metadata * dependencies)
+- Add changes about components versions to the Doc: [NuGet releases](https://docs.google.com/spreadsheets/d/1O3aUTIkiBffVMRg9qwfqUxqlXHCMx5qV_M1k2LgPrMY/edit?usp=sharing)
+- Push `release/beta4` branch to the GitHub
+- Create PR to `master` branch [New beta version 4]
+- Check CI validations & PR reviews (Azure Pipelines will automatically build packages)
+- After CI builds manual release will be available (release artifacts)
+- Manually run releases for selected components (Azure DevOps) (will be published to NuGet)
+- Merge `release/<version>` branch to the `master`
+- Create tag (for example`v2.0.0-beta4`)
+
+### New milestone
+
+- Open [Milestones](https://github.com/Softeq/XToolkit.WhiteLabel/milestones)
+- Rename `vNext` milestone to `v2 beta N`, with text: [ All issues related to release v2.0 beta N of the WhiteLabel and components. ]
+- Close `v2 beta N` milestone
+- Create a new `vNext` milestone, with text: [ All issues related to release a future version of the WhiteLabel and components. ]
+
+### GitHub release
+
+- Create new Github WL Release (based on previews with new version tag)
+
+## Update README
+
+- Update `README.md`
+- Create new PR to `master` branch
+
+## Update Documentation
+
+- Checkout to `master` branch
+- Make changes in `documentation/*` folder
+- Build documentation via `cd documentation && ./build.sh`
+- Publish `_site` folder to `gh-pages` branch
+
+---
diff --git a/documentation/articles/toc.yml b/documentation/articles/toc.yml
@@ -90,3 +90,5 @@
       href: contributing-documentation.md
     - name: Developer Guide
       href: developer-guide.md
+    - name: NuGet Release Process
+      href: nuget-release-process.md
diff --git a/documentation/build.sh b/documentation/build.sh
@@ -1,4 +1,4 @@
-
+#!/bin/bash
 
 msbuild -r Softeq.XToolkit.Documentation.csproj
 

diff --git a/nuget/Softeq.XToolkit.Bindings.nuspec b/nuget/Softeq.XToolkit.Bindings.nuspec
@@ -2,38 +2,60 @@
 <package >
   <metadata>
     <id>Softeq.XToolkit.Bindings</id>
-    <version>2.0.0-beta7</version>
+    <version>2.0.0</version>
     <title>Softeq.XToolkit.Bindings</title>
     <authors>Softeq Development Corp.</authors>
     <owners>Softeq Development Corp.</owners>
-    <licenseUrl>https://github.com/Softeq/XToolkit.WhiteLabel/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/Softeq/XToolkit.WhiteLabel</projectUrl>
+    <license type="file">LICENSE</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <projectUrl>https://softeq.github.io/XToolkit.WhiteLabel/articles/xtoolkit/bindings.html</projectUrl>
+    <repository type="git" url="https://github.com/Softeq/XToolkit.WhiteLabel.git" />
     <description>Bindings implementation based on INotifyPropertyChanged interface.</description>
-    <copyright>Copyright 2020 Softeq Development Corp.</copyright>
-    <tags>Softeq XToolkit Xamarin iOS Android Bindings</tags>
+    <copyright>Copyright 2021 Softeq Development Corp.</copyright>
+    <tags>softeq, xtoolkit, xamarin, ios, android, mvvm, bindings</tags>
     <releaseNotes>Releases: https://github.com/Softeq/XToolkit.WhiteLabel/releases</releaseNotes>
     <dependencies>
      <group targetFramework="netstandard2.1">
-        <dependency id="Softeq.XToolkit.Common" version="[1.1.0-beta7]" />
+        <dependency id="Softeq.XToolkit.Common" version="1.1.0-beta7" />
       </group>
      <group targetFramework="MonoAndroid9.0">
-        <dependency id="Softeq.XToolkit.Common" version="[1.1.0-beta7]" />
-        <dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0.2" />
+        <dependency id="Softeq.XToolkit.Common" version="1.1.0-beta7" />
+        <dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0.8" />
       </group>
      <group targetFramework="Xamarin.iOS10">
-        <dependency id="Softeq.XToolkit.Common" version="[1.1.0-beta7]" />
+        <dependency id="Softeq.XToolkit.Common" version="1.1.0-beta7" />
       </group>
    </dependencies>
   </metadata>
   <files>
+
+    <file src="../LICENSE" />
+
     <!-- Core -->
-    <file src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.dll" target="lib\netstandard2.1" />
+    <file
+      src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.*"
+      exclude="**/*.deps.json"
+      target="lib\netstandard2.1" />
+
     <!-- Droid -->
-    <file src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.dll" target="lib\MonoAndroid90" />
-    <file src="../Softeq.XToolkit.Bindings.Droid/bin/Release/Softeq.XToolkit.Bindings.Droid.dll" target="lib\MonoAndroid90" />
+    <file
+      src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.*"
+      exclude="**/*.deps.json"
+      target="lib\MonoAndroid90" />
+    <file
+      src="../Softeq.XToolkit.Bindings.Droid/bin/Release/Softeq.XToolkit.Bindings.Droid.*"
+      exclude="**/*.deps.json"
+      target="lib\MonoAndroid90" />
+
     <!-- iOS -->
-    <file src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.dll" target="lib\Xamarin.iOS10" />
-    <file src="../Softeq.XToolkit.Bindings.iOS/bin/Release/Softeq.XToolkit.Bindings.iOS.dll" target="lib\Xamarin.iOS10" />
+    <file
+      src="../Softeq.XToolkit.Bindings/bin/Release/netstandard2.1/Softeq.XToolkit.Bindings.*"
+      exclude="**/*.deps.json"
+      target="lib\Xamarin.iOS10" />
+    <file
+      src="../Softeq.XToolkit.Bindings.iOS/bin/Release/Softeq.XToolkit.Bindings.iOS.*"
+      exclude="**/*.deps.json"
+      target="lib\Xamarin.iOS10" />
+
   </files>
 </package>
diff --git a/nuget/Softeq.XToolkit.Common.nuspec b/nuget/Softeq.XToolkit.Common.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Softeq.XToolkit.Common</id>
-    <version>1.2.0-beta1</version>
+    <version>1.2.0</version>
     <title>Softeq.XToolkit.Common</title>
     <authors>Softeq Development Corp.</authors>
     <owners>Softeq Development Corp.</owners>
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@

		#!/bin/bash

		msbuild -r Softeq.XToolkit.Documentation.csproj

Expand Down