Fixed builds for both local (legacy open ssl) and azure pipelines env…

…ironments
intelequia · Nov 12, 2022 · 82efae8 · 82efae8
1 parent 4204fe5
commit 82efae8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 6 deletions.
diff --git a/...tication.Azure.B2C.Extensibility/DotNetNuke.Authentication.Azure.B2C.Extensibility.csproj b/...tication.Azure.B2C.Extensibility/DotNetNuke.Authentication.Azure.B2C.Extensibility.csproj
@@ -30,6 +30,15 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Legacy|AnyCPU'">
+    <OutputPath>bin\Release Legacy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/DotNetNuke.Authentication.Azure.B2C/DotNetNuke.Authentication.Azure.B2C.csproj b/DotNetNuke.Authentication.Azure.B2C/DotNetNuke.Authentication.Azure.B2C.csproj
@@ -36,6 +36,16 @@
     </DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release Legacy|AnyCPU'">
+    <OutputPath>bin\Release Legacy\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>1591</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Azure.Core, Version=1.18.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
       <HintPath>packages\Azure.Core.1.18.0\lib\net461\Azure.Core.dll</HintPath>
@@ -388,7 +398,7 @@
     <Error Condition="!Exists('..\DotNetNuke.Authentication.Azure.B2C\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\DotNetNuke.Authentication.Azure\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>IF $(ConfigurationName)==Debug copy $(TargetDir)$(TargetName).* c:\websites\b2c.dnndev.me\bin /Y</PostBuildEvent>
+    <PostBuildEvent>IF "$(ConfigurationName)"=="Debug" copy $(TargetDir)$(TargetName).* c:\websites\b2c.dnndev.me\bin /Y</PostBuildEvent>
   </PropertyGroup>
   <Import Project="..\.build\ModulePackage.Targets" />
   <Import Project="..\DotNetNuke.Authentication.Azure.B2C\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets" Condition="Exists('..\DotNetNuke.Authentication.Azure.B2C\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" />
@@ -405,9 +415,13 @@
     </Task>
   </UsingTask>
   <Target Name="SampleTarget" BeforeTargets="PackageModule" Condition=" '$(Configuration)' == 'Release' ">
+    <SetEnvironmentVariableTask Name="NODE_ENV" Value="production" />
+    <Exec Command="webpack --mode production --env production" WorkingDirectory="AzureADB2C.Web" />
+  </Target>
+  <Target Name="SampleTargetLegacy" BeforeTargets="PackageModule" Condition=" '$(Configuration)' == 'Release Legacy' ">
     <SetEnvironmentVariableTask Name="NODE_ENV" Value="production" />
     <SetEnvironmentVariableTask Name="NODE_OPTIONS" Value="--openssl-legacy-provider" />
-	<Exec Command="webpack --mode production --env production" WorkingDirectory="AzureADB2C.Web" />
+    <Exec Command="webpack --mode production --env production" WorkingDirectory="AzureADB2C.Web" />
   </Target>
   <Target Name="AfterBuild" DependsOnTargets="PackageModule">
   </Target>

diff --git a/DotNetNuke.Authentication.Azure.B2C/DotNetNuke.Authentication.Azure.B2C.sln b/DotNetNuke.Authentication.Azure.B2C/DotNetNuke.Authentication.Azure.B2C.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31702.278
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Authentication.Azure.B2C", "DotNetNuke.Authentication.Azure.B2C.csproj", "{F5BB1B82-D843-4709-A57E-3A9CC290403F}"
 EndProject
@@ -16,15 +16,20 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Release Legacy|Any CPU = Release Legacy|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F5BB1B82-D843-4709-A57E-3A9CC290403F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5BB1B82-D843-4709-A57E-3A9CC290403F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5BB1B82-D843-4709-A57E-3A9CC290403F}.Release Legacy|Any CPU.ActiveCfg = Release Legacy|Any CPU
+		{F5BB1B82-D843-4709-A57E-3A9CC290403F}.Release Legacy|Any CPU.Build.0 = Release Legacy|Any CPU
 		{F5BB1B82-D843-4709-A57E-3A9CC290403F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5BB1B82-D843-4709-A57E-3A9CC290403F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42445032-9098-4160-930D-4127DC292695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42445032-9098-4160-930D-4127DC292695}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42445032-9098-4160-930D-4127DC292695}.Release Legacy|Any CPU.ActiveCfg = Release Legacy|Any CPU
+		{42445032-9098-4160-930D-4127DC292695}.Release Legacy|Any CPU.Build.0 = Release Legacy|Any CPU
 		{42445032-9098-4160-930D-4127DC292695}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42445032-9098-4160-930D-4127DC292695}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

diff --git a/DotNetNuke.Authentication.Azure.B2C/admin/personaBar/scripts/bundles/bundle-en.js b/DotNetNuke.Authentication.Azure.B2C/admin/personaBar/scripts/bundles/bundle-en.js
diff --git a/DotNetNuke.Authentication.Azure.B2C/admin/personaBar/scripts/bundles/bundle-en.js.map b/DotNetNuke.Authentication.Azure.B2C/admin/personaBar/scripts/bundles/bundle-en.js.map