Merge pull request #253 from WillStrohl/development

Sync dev and main
WillStrohl · Oct 31, 2024 · f114d04 · f114d04
2 parents 073b28e + 9e53291
commit f114d04
Show file tree

Hide file tree

Showing 874 changed files with 732 additions and 25,615 deletions.
diff --git a/Build/ModulePackage.targets b/Build/ModulePackage.targets
@@ -111,6 +111,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       <InstallInclude Include="**\*.bmp" Exclude="packages\**;node_modules\**;clientApp\**;client-app\**" />
       <InstallInclude Include="**\*.xml" Exclude="packages\**;node_modules\**;clientApp\**;client-app\**;bin\**" />
       <InstallInclude Include="**\web.config" Exclude="packages\**;node_modules\**;clientApp\**;client-app\**" />
+	  <InstallInclude Include="**\*.xml.resources" Exclude="Config/ogConfig*.xml.resources;Config/ogSettings*.xml.resources"/>
     </ItemGroup>
 
     <CreateItem Include="$(DNNFileName).dnn">

diff --git a/Build/SolutionReferences.targets b/Build/SolutionReferences.targets
@@ -22,7 +22,7 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -->
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <DnnVersion>09.08.00</DnnVersion>
+    <DnnVersion>09.10.00</DnnVersion>
     <HccVersion>03.06.00</HccVersion>
     <ReferencesPath>..\..\References</ReferencesPath>
     <DnnReferencePath>$(ReferencesPath)\DNN\$(DnnVersion)</DnnReferencePath>

diff --git a/Modules/DNNHangout/App_LocalResources/Edit.ascx.resx b/Modules/DNNHangout/App_LocalResources/Edit.ascx.resx
diff --git a/Modules/DNNHangout/App_LocalResources/Settings.ascx.resx b/Modules/DNNHangout/App_LocalResources/Settings.ascx.resx