Merge branch 'dev'

aspnetboilerplate · Jan 14, 2021 · a235e9e · a235e9e
2 parents 727b0c0 + b976c20
commit a235e9e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -51,7 +51,7 @@
 
         # Download install script
         $DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
-        New-Item -ItemType Directory -Path $TempDirectory | Out-Null
+        New-Item -ItemType Directory -Path $TempDirectory -Force | Out-Null
         (New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
 
         # Install by channel or version

diff --git a/common.props b/common.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>6.1.1</Version>
+        <Version>6.2.0</Version>
         <NoWarn>$(NoWarn);CS1591</NoWarn>
         <PackageIconUrl>http://www.aspnetboilerplate.com/images/abp_nupkg.png</PackageIconUrl>
         <PackageProjectUrl>http://www.aspnetboilerplate.com/</PackageProjectUrl>
@@ -12,15 +12,8 @@
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     </PropertyGroup>
     <PropertyGroup>
-        <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-
-        <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-        <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <!-- Include symbol files (*.pdb) in the built .nupkg -->
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     </PropertyGroup>
     <ItemGroup>
         <!-- Add PackageReference specific for your source control provider (see below) -->

diff --git a/doc/WebSite/Notification-System.md b/doc/WebSite/Notification-System.md
@@ -88,7 +88,7 @@ a **specific entity** (Photo), if the user wants to get notified if anyone
 writes a comment to a specified photo.
 
 Every notification type should have a **unique name** (like
-*SentFrendshipRequest* and *CommentPhoto* in the examples)
+*SentFriendshipRequest* and *CommentPhoto* in the examples)
 
 The **INotificationSubscriptionManager** also has the **UnsubscribeAsync,
 IsSubscribedAsync, GetSubscriptionsAsync**... methods to manage
@@ -108,9 +108,9 @@ subscriptions.
         }
 
         //Send a general notification to a specific user
-        public async Task Publish_SentFrendshipRequest(string senderUserName, string friendshipMessage, UserIdentifier targetUserId)
+        public async Task Publish_SentFriendshipRequest(string senderUserName, string friendshipMessage, UserIdentifier targetUserId)
         {
-            await _notificationPublisher.PublishAsync("SentFrendshipRequest", new SentFrendshipRequestNotificationData(senderUserName, friendshipMessage), userIds: new[] { targetUserId });
+            await _notificationPublisher.PublishAsync("SentFriendshipRequest", new SentFriendshipRequestNotificationData(senderUserName, friendshipMessage), userIds: new[] { targetUserId });
         }
 
         //Send an entity notification to a specific user
@@ -131,17 +131,17 @@ subscriptions.
     }
 
 In the first example, we published a notification to a single user.
-*SentFrendshipRequestNotificationData* should be derived from
+*SentFriendshipRequestNotificationData* should be derived from
 **NotificationData** like this:
 
     [Serializable]
-    public class SentFrendshipRequestNotificationData : NotificationData
+    public class SentFriendshipRequestNotificationData : NotificationData
     {
         public string SenderUserName { get; set; }
 
         public string FriendshipMessage { get; set; }
 
-        public SentFrendshipRequestNotificationData(string senderUserName, string friendshipMessage)
+        public SentFriendshipRequestNotificationData(string senderUserName, string friendshipMessage)
         {
             SenderUserName = senderUserName;
             FriendshipMessage = friendshipMessage;