Merge branch 'develop' into fix/scheduler-happy-path-drift

Author: r90727

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -3,94 +3,94 @@ description: Report a bug
 title: "[Bug]: "
 labels: ["Status: New"]
 assignees:
-  - dnnsoftware/triage
+- dnnsoftware/triage
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-      - label: I have searched the existing issues
-        required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: Also tell us, what did you expect to happen?
-      placeholder: Tell us what you see! "A bug happened, but I was expecting this!"
-    validations:
+- type: markdown
+  attributes:
+    value: |
+      Thanks for taking the time to fill out this bug report!
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
       required: true
-  - type: textarea
-    id: steps-to-reproduce
-    attributes:
-      label: Steps to reproduce?
-      description: List the precise steps to reproduce the bug.
-      placeholder: | 
-        1. Go to '...'
-        2. Click on '...'
-        3. Scroll to '...'
-        4. See error...
-    validations:
+- type: textarea
+  id: what-happened
+  attributes:
+    label: What happened?
+    description: Also tell us, what did you expect to happen?
+    placeholder: Tell us what you see! "A bug happened, but I was expecting this!"
+  validations:
+    required: true
+- type: textarea
+  id: steps-to-reproduce
+  attributes:
+    label: Steps to reproduce?
+    description: List the precise steps to reproduce the bug.
+    placeholder: |
+      1. Go to '...'
+      2. Click on '...'
+      3. Scroll to '...'
+      4. See error...
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Current Behavior
+    description: A concise description of what you're experiencing.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A concise description of what you expected to happen.
+  validations:
+    required: false
+- type: textarea
+  id: logs
+  attributes:
+    label: Relevant log output
+    description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+    render: shell
+- type: textarea
+  id: anything-else
+  attributes:
+    label: Anything else?
+    description: |
+      Links? References? Anything that will give us more context about the issue you are encountering!
+      _Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in._
+  validations:
+    required: false
+- type: dropdown
+  id: affected-versions
+  attributes:
+    label: Affected Versions
+    description: |
+      What version of DNN are you running?
+      **NOTE:** _If your version is not listed, please upgrade to the latest version. If you cannot upgrade at this time, please open a [Discussion](https://github.com/dnnsoftware/Dnn.Platform/discussions) instead._
+    multiple: true
+    options:
+    - 10.2.3 (latest release)
+    - develop build (unreleased)
+  validations:
+    required: true
+- type: dropdown
+  id: affected-browsers
+  attributes:
+    label: What browsers are you seeing the problem on?
+    multiple: true
+    options:
+    - Firefox
+    - Chrome
+    - Safari
+    - Microsoft Edge
+- type: checkboxes
+  id: terms
+  attributes:
+    label: Code of Conduct
+    description: By submitting this issue, you agree to follow our [Code of Conduct](/CODE_OF_CONDUCT.md)
+    options:
+    - label: I agree to follow this project's Code of Conduct
       required: true
-  - type: textarea
-    attributes:
-      label: Current Behavior
-      description: A concise description of what you're experiencing.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: A concise description of what you expected to happen.
-    validations:
-      required: false
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-  - type: textarea
-    id: anything-else
-    attributes:
-      label: Anything else?
-      description: | 
-        Links? References? Anything that will give us more context about the issue you are encountering!
-        _Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in._
-    validations:
-      required: false
-  - type: dropdown
-    id: affected-versions
-    attributes:
-      label: Affected Versions
-      description: | 
-        What version of DNN are you running?
-        **NOTE:** _If your version is not listed, please upgrade to the latest version. If you cannot upgrade at this time, please open a [Discussion](https://github.com/dnnsoftware/Dnn.Platform/discussions) instead._
-      multiple: true
-      options:
-        - 10.2.2 (latest v10 release)
-        - Current development branch (unreleased)
-    validations:
-      required: true
-  - type: dropdown
-    id: affected-browsers
-    attributes:
-      label: What browsers are you seeing the problem on?
-      multiple: true
-      options:
-        - Firefox
-        - Chrome
-        - Safari
-        - Microsoft Edge
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Code of Conduct
-      description: By submitting this issue, you agree to follow our [Code of Conduct](/CODE_OF_CONDUCT.md)
-      options:
-        - label: I agree to follow this project's Code of Conduct
-          required: true

.github/workflows/updateVersions.yml

@@ -26,11 +26,13 @@
     <PackageReference Include="Cake.Json" />
     <PackageReference Include="Cake.XdtTransform" />
     <PackageReference Include="Dnn.CakeUtils" />
+    <PackageReference Include="Octokit" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="10.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" VersionOverride="10.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" VersionOverride="8.15.0" />
     <PackageReference Include="Microsoft.Identity.Client" VersionOverride="4.81.0" />
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="YamlDotNet" />
   </ItemGroup>
 </Project>

Build/Build.csproj

@@ -1,85 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <DotNetNukeMSBuildTasksLib>$(BuildScriptsPath)\DotNetNuke.MSBuild.Tasks.dll</DotNetNukeMSBuildTasksLib>
-    <YuiLib>$(BuildScriptsPath)\Yahoo.Yui.Compressor.MsBuild.dll</YuiLib>
+    <CompressCss>True</CompressCss>
   </PropertyGroup>
 
-  <Import Project="MSBuild.Community.Tasks.Targets" />
-  <UsingTask AssemblyFile="$(DotNetNukeMSBuildTasksLib)" TaskName="DotNetNuke.MSBuild.Tasks.ExtensionPackager" />
-  <UsingTask AssemblyFile="$(YuiLib)" TaskName="CssCompressorTask" />
-  <!--<UsingTask AssemblyFile="$(YuiLib)" TaskName="JavaScriptCompressorTask" />-->
-
-  <Target Name="Package" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <XmlRead Prefix="n"
-                   Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
-                   XPath="dotnetnuke/packages/package/@version"
-                   XmlFileName="$(DNNFileName).dnn">
-      <Output TaskParameter="Value" PropertyName="Version" />
-    </XmlRead>
-    <ExtensionPackager Manifest="$(DNNFileName).dnn" WorkingFolder="$(MSBuildProjectDirectory)\">
-      <Output TaskParameter="PackageFiles" PropertyName="PackageFiles">
-      </Output>
-    </ExtensionPackager>
-
-    <CallTarget Targets="Minification"/>
-
-    <Copy SourceFiles="$(DNNFileName).dnn" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-    <ItemGroup>
-      <LicenseFiles Include="license.txt"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(LicenseFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-    <ItemGroup>
-      <ReleaseNotesFiles Include="releaseNotes.txt"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(ReleaseNotesFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-    <CreateItem Include="$(PackageFiles)">
-      <Output TaskParameter="Include" ItemName="OutputContent" />
-    </CreateItem>
-    <Copy SourceFiles="$(OutputContent)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(OutputContent.RecursiveDir)" />
-    <CreateItem Include="$(MSBuildProjectDirectory)\Package\**\*.*">
-      <Output TaskParameter="Include" ItemName="OutputContent" />
-    </CreateItem>
-    <Zip Files="@(OutputContent)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Install.$(Extension)" />
-    <Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="$(InstallPath)" />
-    <Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
-    <RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" ContinueOnError="WarnAndContinue" />
-  </Target>
-
-  <Target Name="Minification">
-
-    <MakeDir Directories="$(MSBuildProjectDirectory)\Package"/>
-    <Zip Files="@(Resources)" WorkingDirectory="$(MSBuildProjectDirectory)" ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" />
-    <Unzip ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" TargetDirectory="$(MSBuildProjectDirectory)\Package\Resources" />
-    <Delete Files="$(MSBuildProjectDirectory)\Package\Resources.zip" />
-    <ItemGroup>
-      <!--<_JSFilesToMinify Include="$(MSBuildProjectDirectory)\Package\Resources\**\*.js" Exclude="$(MSBuildProjectDirectory)\Package\Resources\**\*.min.js" />-->
-      <_Step2FilesToZip Include="$(MSBuildProjectDirectory)\Package\Resources\**\*" />
-    </ItemGroup>
-    <!--
-    <Message Text="Compressing Javascript files" Importance="high" />
-    <JavaScriptCompressorTask Files="@(_JSFilesToMinify)" ContinueOnError="WarnAndContinue" />
-    -->
-
-    <ItemGroup>
-      <_CSSFilesToCompress Include="$(MSBuildProjectDirectory)\*\*.css;$(MSBuildProjectDirectory)\*\*\*.css;$(MSBuildProjectDirectory)\*\*\*\*.css;$(MSBuildProjectDirectory)\*\*\*\*\*.css;" Exclude="Package\**\*;**\node_modules\**;**\WebApps\**" />
-    </ItemGroup>
-    <Message Text="Compressing the following CSS files:" Importance="high" />
-    <Message Text="%(_CSSFilesToCompress.Identity)" Importance="high" />
-
-    <CssCompressorTask
-        SourceFiles="@(_CSSFilesToCompress)"
-        DeleteSourceFiles="false"
-        OutputFile="$(MSBuildProjectDirectory)\Package\Resources\%(RecursiveDir)%(Filename)%(Extension)"
-        CompressionType="Standard"
-        LoggingType="Info"
-        PreserveComments="false"
-        LineBreakPosition="-1"
-        Condition="@(_CSSFilesToCompress->Count())!=0"
-     />
-
-    <Zip Files="@(_Step2FilesToZip)" WorkingDirectory="$(ResourceZipWorkingDirectory)"
-         ZipFileName="$(MSBuildProjectDirectory)\Package\Resources.zip" />
-    <RemoveDir Directories ="$(MSBuildProjectDirectory)\Package\Resources" ContinueOnError="WarnAndContinue" />
-  </Target>
+  <Import Project="Package.Targets" />
 </Project>