Skip to content

Commit

Permalink
Merge pull request #4116 from dnnsoftware/release/9.7.2
Browse files Browse the repository at this point in the history
Release/9.7.2
  • Loading branch information
valadas authored Sep 21, 2020
2 parents 3362109 + f65c7a7 commit 82a3a08
Show file tree
Hide file tree
Showing 133 changed files with 3,977 additions and 2,671 deletions.
1 change: 1 addition & 0 deletions .github/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ To build the .net projects to the right location, you'll need to create your ove
```

Once you've created this file every time you click "rebuild" in Visual Studio on a project (or the solution) you'll see the content change in your dev site.
**Note**: You may have to restart Visual Studio for this new build file to take effect.

For the Webpack projects it is set up to read from the `settings.local.json` file and use the `WebsitePath` to copy generated js files to their right place.

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ Provide any additional context that may be helpful in understanding and/or resol
Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums
-->
* [ ] 10.00.00 alpha build
* [ ] 09.07.01 release candidate
* [ ] 09.07.00 latest supported release
* [ ] 09.07.02 release candidate
* [ ] 09.07.01 latest supported release

## Affected browser
<!--
Expand Down
2 changes: 1 addition & 1 deletion Build/Symbols/DotNetNuke_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke_Symbols" type="Library" version="09.07.01" >
<package name="DotNetNuke_Symbols" type="Library" version="09.07.02" >
<friendlyName>DNN Platform Symbols</friendlyName>
<description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
<owner>
Expand Down
5 changes: 5 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Code of Conduct

This project has adopted the code of conduct defined by the Contributor Covenant
to clarify expected behavior in our community.
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Console" type="Module" version="09.07.01">
<package name="DotNetNuke.Console" type="Module" version="09.07.02">
<friendlyName>Console</friendlyName>
<description>Display children pages as icon links for navigation.</description>
<iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Module Creator" type="Module" version="09.07.01">
<package name="DotNetNuke.Module Creator" type="Module" version="09.07.02">
<friendlyName>Module Creator</friendlyName>
<description>Development of modules.</description>
<iconFile>~/Icons/Sigma/ModuleCreator_32x32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.07.01">
<package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.07.02">
<friendlyName>DotNetNuke Telerik Web Components</friendlyName>
<description>Provides Telerik Components for DotNetNuke.</description>
<dependencies/>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Connectors/Azure/AzureConnector.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.07.01">
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.07.02">
<friendlyName>Dnn Azure Connector</friendlyName>
<description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
<iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.07.01">
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.07.02">
<friendlyName>Google Analytics Connector</friendlyName>
<description>Configure your sites Google Analytics settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNNJWT" type="Provider" version="09.07.01">
<package name="DNNJWT" type="Provider" version="09.07.02">
<friendlyName>DNN JWT Auth Handler</friendlyName>
<description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
<dependencies/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

namespace DotNetNuke.Abstractions.Application
{
using System;
Expand Down Expand Up @@ -106,8 +105,6 @@ public interface IApplicationInfo
/// </summary>
/// <param name = "productNames">list of product names.</param>
/// <returns>true if product is within list of names.</returns>
/// <remarks>
/// </remarks>
bool ApplyToProduct(string productNames);
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

namespace DotNetNuke.Abstractions.Application
{
using System;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

namespace DotNetNuke.Abstractions.Application
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

namespace DotNetNuke.Abstractions.Application
{
using System.Collections.Generic;
Expand All @@ -13,7 +12,6 @@ namespace DotNetNuke.Abstractions.Application
/// Entity.
/// </summary>
/// <example>
///
/// <code lang="C#">
/// public class MySampleClass
/// {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

namespace DotNetNuke.Abstractions.Application
{
/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

namespace DotNetNuke.Abstractions.Application
{
/// <summary>
Expand Down
23 changes: 11 additions & 12 deletions DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<RootDirectory>$(MSBuildProjectDirectory)\..\..</RootDirectory>
</PropertyGroup>
<Import Project="..\..\DNN_Platform.build" />

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<RootDirectory>$(MSBuildProjectDirectory)\..\..</RootDirectory>
<DocumentationFile>bin/$(Configuration)/$(TargetFramework)/DotNetNuke.Abstractions.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand All @@ -20,13 +21,11 @@
</Compile>
</ItemGroup>

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
</ItemGroup>

<Import Project="..\..\DNN_Platform.build" />
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="XCOPY &quot;$(ProjectDir)bin\$(ConfigurationName)\netstandard2.0\DotNetNuke.Abstractions*&quot; &quot;$(WebsitePath)\bin&quot; /S /Y" />
</Target>
Expand Down
Loading

0 comments on commit 82a3a08

Please sign in to comment.