Following fixes are applied for Hardware request management

1. Removing ITBase solution dependency 2. Removal of deprecated Power BI components 3. Making the app power catalog compliant adding manifest.json and submission.ppkg.json files #30074092
microsoft · Nov 7, 2024 · 3a7226b · 3a7226b
1 parent 819c5af
commit 3a7226b
Show file tree

Hide file tree

Showing 94 changed files with 3,667 additions and 5,500 deletions.
diff --git a/AppSourcePackages/mpa_HardwareRequestAndManagement/input.xml b/AppSourcePackages/mpa_HardwareRequestAndManagement/input.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <PvsPackageData>
   <ProviderName>Microsoft</ProviderName>
   <PackageFile>package.zip</PackageFile>
   <SolutionAnchorName>mpa_HardwareRequestAndManagement_managed.zip</SolutionAnchorName>
   <StartDate>01/01/2019</StartDate>
   <EndDate>01/01/2050</EndDate>
   <SupportedCountries>AD,AE,AF,AG,AI,AL,AM,AO,AQ,AR,AS,AT,AU,AW,AX,AZ,BA,BB,BD,BE,BF,BG,BH,BI,BJ,BL,BM,BN,BO,BR,BS,BT,BV,BW,BY,BZ,CA,CC,CD,CF,CG,CH,CI,CK,CL,CM,CN,CO,CR,CV,CW,CX,CY,CZ,DE,DJ,DK,DM,DO,DZ,EC,EE,EG,ER,ES,ET,FI,FJ,FK,FM,FO,FR,GA,GB,GD,GE,GF,GG,GH,GI,GL,GM,GN,GP,GQ,GR,GS,GT,GU,GW,GY,HK,HM,HN,HR,HT,HU,ID,IE,IL,IM,IN,IO,IQ,IS,IT,JE,JM,JO,JP,KE,KG,KH,KI,KM,KN,KR,KW,KY,KZ,LA,LB,LC,LI,LK,LR,LS,LT,LU,LV,LY,MA,MC,MD,ME,MF,MG,MH,MK,ML,MM,MN,MO,MP,MQ,MR,MS,MT,MU,MV,MW,MX,MY,MZ,NA,NC,NE,NF,NG,NI,NL,NO,NP,NR,NU,NZ,OM,PA,PE,PF,PG,PH,PK,PL,PM,PN,PR,PS,PT,PW,PY,QA,RE,RO,RS,RU,RW,SA,SB,SC,SE,SG,SH,SI,SJ,SK,SL,SM,SN,SO,SR,ST,SV,SZ,TC,TD,TF,TG,TH,TJ,TK,TL,TM,TN,TO,TR,TT,TV,TW,TZ,UA,UG,UM,US,UY,UZ,VA,VC,VE,VG,VI,VN,VU,WF,WS,YE,YT,ZA,ZM,ZW</SupportedCountries>
-  <LearnMoreLink>https://aka.ms/LearnHardwareRequestAndManagementTemplate</LearnMoreLink>
+  <LearnMoreLink>https://aka.ms/LearnHardwareRequestManagement</LearnMoreLink>
   <Locales>
     <PackageLocale Code="1033" IsDefault="true">
       <Logo>logo32x32.png</Logo>

diff --git a/...cePackages/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement_1_0_0_22.zip b/...cePackages/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement_1_0_0_22.zip
diff --git a/AppSourcePackages/mpa_HardwareRequestAndManagement/package.zip b/AppSourcePackages/mpa_HardwareRequestAndManagement/package.zip
diff --git a/DeploymentPackages/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement.csproj b/DeploymentPackages/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net472</TargetFramework>
     <AssemblyTitle>mpa_HardwareRequestAndManagement</AssemblyTitle>
     <Product>mpa_HardwareRequestAndManagement</Product>
-    <Copyright>Copyright © 2023</Copyright>
+    <Copyright>Copyright © 2024</Copyright>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.PowerApps.MSBuild.PDPackage" Version="1.*">
@@ -17,7 +17,6 @@
     <Reference Include="System.ComponentModel.Composition" />
   </ItemGroup>
   <ItemGroup>
-    <PdSolution Include="..\..\Solutions\mpa_ITBase\bin\Release\mpa_ITBase_managed.zip" />
     <PdSolution Include="..\..\Solutions\mpa_HardwareRequestAndManagement\bin\Release\mpa_HardwareRequestAndManagement_managed.zip" />
   </ItemGroup>
 </Project>
diff --git a/Solutions/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement.cdsproj b/Solutions/mpa_HardwareRequestAndManagement/mpa_HardwareRequestAndManagement.cdsproj
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PowerAppsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\PowerApps</PowerAppsTargetsPath>
   </PropertyGroup>
-
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
   <Import Project="$(PowerAppsTargetsPath)\Microsoft.PowerApps.VisualStudio.Solution.props" Condition="Exists('$(PowerAppsTargetsPath)\Microsoft.PowerApps.VisualStudio.Solution.props')" />
-
   <PropertyGroup>
-    <ProjectGuid>cdaba3f2-873c-49f3-a8ce-dc09ed668fa8</ProjectGuid>
+    <ProjectGuid>907a0ed1-4747-43c7-b50b-93ecfa3d9907</ProjectGuid>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <!--Remove TargetFramework when this is available in 16.1-->
     <TargetFramework>net462</TargetFramework>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <SolutionRootPath>src</SolutionRootPath>
     <SolutionPackageType>Both</SolutionPackageType>
   </PropertyGroup>
-
   <!-- 
     Solution Packager overrides, un-comment to use: SolutionPackagerType (Managed, Unmanaged, Both)
     Solution Localization Control, if you want to enabled localization of your solution, un-comment SolutionPackageEnableLocalization and set the value to true. - Requires use of -loc flag on Solution Clone or Sync
@@ -27,12 +24,10 @@
     <SolutionPackageEnableLocalization>false</SolutionPackageEnableLocalization>
   </PropertyGroup>
   -->
-
   <ItemGroup>
     <PackageReference Include="Microsoft.PowerApps.MSBuild.Solution" Version="1.*" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
-
   <ItemGroup>
     <ExcludeDirectories Include="$(MSBuildThisFileDirectory)\.gitignore" />
     <ExcludeDirectories Include="$(MSBuildThisFileDirectory)\bin\**" />
@@ -41,15 +36,12 @@
     <ExcludeDirectories Include="$(MSBuildThisFileDirectory)\*.cdsproj.user" />
     <ExcludeDirectories Include="$(MSBuildThisFileDirectory)\*.sln" />
   </ItemGroup>
-
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)\**" Exclude="@(ExcludeDirectories)" />
     <Content Include="$(SolutionPackageZipFilePath)">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
   <Import Project="$(PowerAppsTargetsPath)\Microsoft.PowerApps.VisualStudio.Solution.targets" Condition="Exists('$(PowerAppsTargetsPath)\Microsoft.PowerApps.VisualStudio.Solution.targets')" />
-
-</Project>
+</Project>
diff --git a/...RequestAndManagement/src/AppModuleSiteMaps/mpa_AssetManagmentTracker/AppModuleSiteMap.xml b/...RequestAndManagement/src/AppModuleSiteMaps/mpa_AssetManagmentTracker/AppModuleSiteMap.xml
@@ -14,7 +14,7 @@
         <Titles>
           <Title LCID="1033" Title="Dashboards" />
         </Titles>
-        <SubArea Id="subarea_68868d86" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="7579fb5e-7761-ee11-be6e-00224808117c" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" ToolTipResourseId="DashboardTooltip">
+        <SubArea Id="subarea_68868d86" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="7579fb5e-7761-ee11-be6e-00224808117c" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
           <Titles>
             <Title LCID="1033" Title="Reports" />
           </Titles>
@@ -24,12 +24,12 @@
         <Titles>
           <Title LCID="1033" Title="Requests" />
         </Titles>
-        <SubArea Id="subarea_092c5a5b" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_hardwarerequest" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
+        <SubArea Id="subarea_092c5a5b" Entity="mpa_hardwarerequest" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
           <Titles>
             <Title LCID="1033" Title="Requests" />
           </Titles>
         </SubArea>
-        <SubArea Id="subarea_204682aa" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_hardwarerequestitem" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
+        <SubArea Id="subarea_204682aa" Entity="mpa_hardwarerequestitem" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
           <Titles>
             <Title LCID="1033" Title="Request Items" />
           </Titles>
@@ -39,12 +39,12 @@
         <Titles>
           <Title LCID="1033" Title="Budget" />
         </Titles>
-        <SubArea Id="subarea_b4b237b5" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_budget" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
+        <SubArea Id="subarea_b4b237b5" Entity="mpa_budget" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
           <Titles>
             <Title LCID="1033" Title="Budgets" />
           </Titles>
         </SubArea>
-        <SubArea Id="subarea_357aecfd" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_purchaseorder" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
+        <SubArea Id="subarea_357aecfd" Entity="mpa_purchaseorder" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
           <Titles>
             <Title LCID="1033" Title="Purchase Orders" />
           </Titles>
@@ -54,23 +54,23 @@
         <Titles>
           <Title LCID="1033" Title="Assets" />
         </Titles>
-        <SubArea Id="subarea_823286cb" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_asset" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
+        <SubArea Id="subarea_823286cb" Entity="mpa_asset" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
       </Group>
       <Group Id="group_89f9e9c0" ResourceId="SitemapDesigner.NewGroup" DescriptionResourceId="SitemapDesigner.NewGroup" IntroducedVersion="7.0.0.0" IsProfile="false" ToolTipResourseId="SitemapDesigner.Unknown">
         <Titles>
           <Title LCID="1033" Title="Catalog" />
         </Titles>
-        <SubArea Id="subarea_ae45556b" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_product" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
+        <SubArea Id="subarea_ae45556b" Entity="mpa_product" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
           <Titles>
             <Title LCID="1033" Title="Products" />
           </Titles>
         </SubArea>
-        <SubArea Id="subarea_31ffe67e" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_producttype" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
+        <SubArea Id="subarea_31ffe67e" Entity="mpa_producttype" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
           <Titles>
             <Title LCID="1033" Title="Product Types" />
           </Titles>
         </SubArea>
-        <SubArea Id="subarea_79dc2649" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_productsubtype" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
+        <SubArea Id="subarea_79dc2649" Entity="mpa_productsubtype" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
           <Titles>
             <Title LCID="1033" Title="Product Subtypes" />
           </Titles>
@@ -80,19 +80,9 @@
         <Titles>
           <Title LCID="1033" Title="Administration" />
         </Titles>
-        <SubArea Id="subarea_2ae4f671" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_businessgroup" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
+        <SubArea Id="subarea_2ae4f671" Entity="mpa_businessgroup" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
         <SubArea Id="subarea_921fcfa5" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="team" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
         <SubArea Id="subarea_23679bcc" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="systemuser" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
-        <SubArea Id="subarea_4c13542b" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_iterror" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
-          <Titles>
-            <Title LCID="1033" Title="Errors" />
-          </Titles>
-        </SubArea>
-        <SubArea Id="subarea_418f7281" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_itlocalization" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
-          <Titles>
-            <Title LCID="1033" Title="Localizations" />
-          </Titles>
-        </SubArea>
       </Group>
     </Area>
   </SiteMap>