Merge pull request #137 from DNNCommunity/release/1.3.0

Merge `release/1.3.0` into `main` for `1.3.0` release

Module.csproj

@@ -92,19 +92,19 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DotNetNuke.Core">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Instrumentation">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Web">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.WebApi">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Core">
-      <Version>5.2.7</Version>
+      <Version>5.2.9</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <Version>6.0.0</Version>
@@ -115,7 +115,7 @@
       <Version>10.0.3</Version>
     </PackageReference>
     <PackageReference Include="NSwag.Annotations">
-      <Version>13.17.0</Version>
+      <Version>13.19.0</Version>
     </PackageReference>
     <PackageReference Include="StyleCop.Analyzers">
       <Version>1.1.118</Version>
@@ -125,7 +125,9 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="resources\App_LocalResources\ModelValidation.resx" />
-    <EmbeddedResource Include="resources\App_LocalResources\UI.resx" />
+    <EmbeddedResource Include="resources\App_LocalResources\UI.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Services/LocalizationService.cs

@@ -88,6 +88,8 @@ private LocalizationViewModel HydrateViewModel()
             {
                 DnnPlatformVersion = this.GetString("DnnPlatformVersion", "UI.resx"),
                 DnnSecurityCenter = this.GetString("DnnSecurityCenter", "UI.resx"),
+                Loading = this.GetString("Loading", "UI.resx"),
+                NoBulletins = this.GetString("NoBulletins", "UI.resx"),
 
             };
             viewModel.UI = ui;

UnitTests/UnitTests.csproj

@@ -77,19 +77,19 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Abstractions">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Core">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Instrumentation">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Web">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.WebApi">
-      <Version>9.10.2</Version>
+      <Version>9.11.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel">
       <Version>17.3.2</Version>

ViewModels/LocalizationViewModel.cs

@@ -55,6 +55,14 @@ public class UIInfo
             /// <example>DNN Security Center</example>
             public string DnnSecurityCenter { get; set; }
 
+            /// <summary>Gets or sets the Loading localized text.</summary>
+            /// <example>Loading...</example>
+            public string Loading { get; set; }
+
+            /// <summary>Gets or sets the NoBulletins localized text.</summary>
+            /// <example>There are no known security vulnerabilities for the selected DNN Platform version.</example>
+            public string NoBulletins { get; set; }
+
 
         }
 

_build/Build.cs

@@ -81,7 +81,7 @@ internal class Build : NukeBuild
 
     [Solution] readonly Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
-    [GitVersion] readonly GitVersion GitVersion;
+    [GitVersion(Framework = "net6.0", UpdateAssemblyInfo = false, NoFetch = true)] readonly GitVersion GitVersion;
 
     AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts";
     AbsolutePath InstallDirectory => RootDirectory.Parent.Parent / "Install" / "Module";
@@ -443,6 +443,7 @@ internal class Build : NukeBuild
     Target TagRelease => _ => _
         .OnlyWhenDynamic(() => GitRepository != null && (GitRepository.IsOnMainOrMasterBranch() || GitRepository.IsOnReleaseBranch()))
         .OnlyWhenDynamic(() => !string.IsNullOrWhiteSpace(GitHubToken))
+        .DependsOn(LogInfo)
         .DependsOn(SetupGitHubClient)
         .DependsOn(UpdateTokens)
         .Before(Compile)

_build/_build.csproj

@@ -22,7 +22,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NSwag.MSBuild" Version="13.15.10" />
-    <PackageDownload Include="GitVersion.Tool" Version="[5.7.0]" />
+    <PackageDownload Include="GitVersion.Tool" Version="[5.10.1]" />
     <PackageDownload Include="coverlet.console" Version="[1.7.2]" />
   </ItemGroup>
 

docs/rest/rest.json

@@ -111,6 +111,16 @@
           "type": "string",
           "description": "Gets or sets the DnnSecurityCenter localized text.",
           "example": "DNN Security Center"
+        },
+        "Loading": {
+          "type": "string",
+          "description": "Gets or sets the Loading localized text.",
+          "example": "Loading..."
+        },
+        "NoBulletins": {
+          "type": "string",
+          "description": "Gets or sets the NoBulletins localized text.",
+          "example": "There are no known security vulnerabilities for the selected DNN Platform version."
         }
       }
     },

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
     "version": "6.0.400",
-    "rollForward": "latestMinor"
+    "rollForward": "latestMajor"
   }
 }

manifest.dnn

@@ -15,7 +15,7 @@
       <releaseNotes src="ReleaseNotes.html" />
       <azureCompatible>True</azureCompatible>
       <dependencies>
-        <dependency type="coreVersion">09.10.02</dependency>
+        <dependency type="coreVersion">09.11.01</dependency>
       </dependencies>
       <components>
         <component type="Assembly">
@@ -27,7 +27,7 @@
             <assembly>
               <name>NSwag.Annotations.dll</name>
               <path>bin</path>
-              <version>13.17.0</version>
+              <version>13.19.0</version>
             </assembly>
           </assemblies>
         </component>

module.web/package.json

@@ -23,7 +23,7 @@
     "generate": "stencil generate"
   },
   "devDependencies": {
-    "@dnncommunity/dnn-elements": "^0.15.1",
+    "@dnncommunity/dnn-elements": "^0.18.0",
     "@stencil/core": "^2.18.0",
     "@stencil/eslint-plugin": "^0.4.0",
     "@stencil/sass": "^2.0.0",
@@ -33,7 +33,7 @@
     "eslint": "^7.32.0",
     "eslint-plugin-react": "^7.31.8",
     "eslint-plugin-tsdoc": "^0.2.17",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.5"
   },
   "license": "MIT"
 }

module.web/src/components/dnn-security-center/dnn-security-center.tsx

@@ -58,6 +58,7 @@ export class DnnSecurityCenter {
   }
 
   private handleSelect(event): void {
+    this.securityBulletins = undefined;
     this.selectValue = event.target.value;
     if (this.selectValue === 'All Versions') {
       window.location.reload();
@@ -98,6 +99,12 @@ export class DnnSecurityCenter {
             )}
           </select>
         </h3>
+        {this.securityBulletins === undefined &&
+          <div class="loading">{this.resx.uI.loading}</div>
+        }
+        {this.securityBulletins?.bulletins?.length === 0 &&
+          <div class="no-bulletins">{this.resx.uI.noBulletins}</div>
+        }
         {this.securityBulletins?.bulletins?.map((bulletin, index) => {
           return (
             <div class="bulletins">

module.web/src/data/dnn-versions.ts

@@ -1,5 +1,7 @@
 const dnnVersions: string[] = [
     'All Versions',
+    '09.11.02',
+    '09.11.01',
     '09.11.00',
     '09.10.01',
     '09.10.00',

module.web/src/services/services.ts

@@ -248,6 +248,10 @@ export class UIInfo implements IUIInfo {
     dnnPlatformVersion?: string | undefined;
     /** Gets or sets the DnnSecurityCenter localized text. */
     dnnSecurityCenter?: string | undefined;
+    /** Gets or sets the Loading localized text. */
+    loading?: string | undefined;
+    /** Gets or sets the NoBulletins localized text. */
+    noBulletins?: string | undefined;
 
     constructor(data?: IUIInfo) {
         if (data) {
@@ -262,6 +266,8 @@ export class UIInfo implements IUIInfo {
         if (_data) {
             this.dnnPlatformVersion = _data["DnnPlatformVersion"];
             this.dnnSecurityCenter = _data["DnnSecurityCenter"];
+            this.loading = _data["Loading"];
+            this.noBulletins = _data["NoBulletins"];
         }
     }
 
@@ -276,6 +282,8 @@ export class UIInfo implements IUIInfo {
         data = typeof data === 'object' ? data : {};
         data["DnnPlatformVersion"] = this.dnnPlatformVersion;
         data["DnnSecurityCenter"] = this.dnnSecurityCenter;
+        data["Loading"] = this.loading;
+        data["NoBulletins"] = this.noBulletins;
         return data;
     }
 }
@@ -286,6 +294,10 @@ export interface IUIInfo {
     dnnPlatformVersion?: string | undefined;
     /** Gets or sets the DnnSecurityCenter localized text. */
     dnnSecurityCenter?: string | undefined;
+    /** Gets or sets the Loading localized text. */
+    loading?: string | undefined;
+    /** Gets or sets the NoBulletins localized text. */
+    noBulletins?: string | undefined;
 }
 
 /** A viewmodel that represents DNN Security Bulletins. */

resources/App_LocalResources/UI.resx

@@ -123,4 +123,10 @@
   <data name="DnnSecurityCenter.Text" xml:space="preserve">
     <value>DNN Security Center</value>
   </data>
+  <data name="Loading.Text" xml:space="preserve">
+    <value>Loading...</value>
+  </data>
+  <data name="NoBulletins.Text" xml:space="preserve">
+    <value>There are no known security vulnerabilities for the selected DNN Platform version.</value>
+  </data>
 </root>