Skip to content

Commit

Permalink
Merge branch 'main' into users/ashar/MeetingRoomServices
Browse files Browse the repository at this point in the history
  • Loading branch information
abhisheksharma0994 authored Oct 10, 2024
2 parents 6ce95cd + b9cd205 commit e36825d
Show file tree
Hide file tree
Showing 137 changed files with 2,644 additions and 5,778 deletions.
2 changes: 1 addition & 1 deletion AppSourcePackages/mpa_ExpenseReimbursement/input.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<PvsPackageData>
<ProviderName>Microsoft</ProviderName>
<PackageFile>package.zip</PackageFile>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file modified AppSourcePackages/mpa_ExpenseReimbursement/package.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<Reference Include="System.ComponentModel.Composition" />
</ItemGroup>
<ItemGroup>
<PdSolution Include="..\..\Solutions\mpa_EmployeeExperienceBase\bin\Release\mpa_EmployeeExperienceBase_managed.zip" />
<PdSolution Include="..\..\Solutions\mpa_ExpenseReimbursement\bin\Release\mpa_ExpenseReimbursement_managed.zip" />
</ItemGroup>
</Project>
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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>181d0f5d-d3a6-44a0-9c66-58576a121bbb</ProjectGuid>
<ProjectGuid>2c2f0a9b-ebdb-46f4-8369-3a8ece3a3ba2</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
Expand All @@ -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\**" />
Expand All @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<ShowPinned>True</ShowPinned>
<ShowRecents>True</ShowRecents>
<SiteMap IntroducedVersion="7.0.0.0">
<Area Id="area_c732f228" ResourceId="SitemapDesigner.NewTitle" DescriptionResourceId="SitemapDesigner.NewTitle" ShowGroups="true" IntroducedVersion="7.0.0.0">
<Area Id="area_c732f228" ResourceId="SitemapDesigner.NewTitle" DescriptionResourceId="SitemapDesigner.NewTitle" Icon="/WebResources/msdyn_/Images/Area_Default_Icon.png" ShowGroups="true" IntroducedVersion="7.0.0.0">
<Titles>
<Title LCID="1033" Title="Area1" />
</Titles>
<Group Id="group_adf35ab8" ResourceId="SitemapDesigner.NewGroup" DescriptionResourceId="SitemapDesigner.NewGroup" IntroducedVersion="7.0.0.0" IsProfile="false" ToolTipResourseId="SitemapDesigner.Unknown">
<Titles>
<Title LCID="1033" Title="Report" />
</Titles>
<SubArea Id="subarea_246e3f96" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="92186161-fad5-ee11-9079-0022480461f7" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" ToolTipResourseId="DashboardTooltip">
<SubArea Id="subarea_246e3f96" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="92186161-fad5-ee11-9079-0022480461f7" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
<Titles>
<Title LCID="1033" Title="Dashboard" />
</Titles>
Expand All @@ -39,8 +39,6 @@
<Titles>
<Title LCID="1033" Title="System" />
</Titles>
<SubArea Id="subarea_c9124bc6" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_employeeexperienceerror" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_78742a55" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_eelocalization" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_aed7ba13" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="transactioncurrency" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_53f85f74" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementappsettings" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
</Group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<ShowPinned>True</ShowPinned>
<ShowRecents>True</ShowRecents>
<SiteMap IntroducedVersion="7.0.0.0">
<Area Id="area_c732f228" ResourceId="SitemapDesigner.NewTitle" DescriptionResourceId="SitemapDesigner.NewTitle" ShowGroups="true" IntroducedVersion="7.0.0.0">
<Area Id="area_c732f228" ResourceId="SitemapDesigner.NewTitle" DescriptionResourceId="SitemapDesigner.NewTitle" Icon="/WebResources/msdyn_/Images/Area_Default_Icon.png" ShowGroups="true" IntroducedVersion="7.0.0.0">
<Titles>
<Title LCID="1033" Title="Area1" />
</Titles>
<Group Id="group_adf35ab8" ResourceId="SitemapDesigner.NewGroup" DescriptionResourceId="SitemapDesigner.NewGroup" IntroducedVersion="7.0.0.0" IsProfile="false" ToolTipResourseId="SitemapDesigner.Unknown">
<Titles>
<Title LCID="1033" Title="Report" />
</Titles>
<SubArea Id="subarea_246e3f96" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="92186161-fad5-ee11-9079-0022480461f7" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" ToolTipResourseId="DashboardTooltip">
<SubArea Id="subarea_246e3f96" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="92186161-fad5-ee11-9079-0022480461f7" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
<Titles>
<Title LCID="1033" Title="Dashboard" />
</Titles>
Expand All @@ -39,8 +39,6 @@
<Titles>
<Title LCID="1033" Title="System" />
</Titles>
<SubArea Id="subarea_c9124bc6" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_employeeexperienceerror" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_78742a55" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_eelocalization" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_aed7ba13" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="transactioncurrency" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_53f85f74" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementappsettings" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
</Group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Titles>
<Title LCID="1033" Title="Report" />
</Titles>
<SubArea Id="subarea_73c549e3" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="92186161-fad5-ee11-9079-0022480461f7" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" ToolTipResourseId="DashboardTooltip">
<SubArea Id="subarea_73c549e3" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="92186161-fad5-ee11-9079-0022480461f7" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
<Titles>
<Title LCID="1033" Title="Dashboards" />
</Titles>
Expand Down Expand Up @@ -42,22 +42,14 @@
</Titles>
</SubArea>
<SubArea Id="subarea_de6bed25" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementsubcategory" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_82128e59" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementappsettings" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_155f9003" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementattachment" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
</Group>
<Group Id="group_8ced7e46" ResourceId="SitemapDesigner.NewGroup" DescriptionResourceId="SitemapDesigner.NewGroup" IntroducedVersion="7.0.0.0" IsProfile="false" ToolTipResourseId="SitemapDesigner.Unknown">
<Titles>
<Title LCID="1033" Title="System" />
</Titles>
<SubArea Id="subarea_4604979c" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_employeeexperienceerror" 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_9e47e9b3" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_eelocalization" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
<Titles>
<Title LCID="1033" Title="Localizations" />
</Titles>
</SubArea>
<SubArea Id="subarea_ec719e1c" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="transactioncurrency" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_82128e59" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementappsettings" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
</Group>
</Area>
</SiteMap>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Titles>
<Title LCID="1033" Title="Report" />
</Titles>
<SubArea Id="subarea_73c549e3" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="92186161-fad5-ee11-9079-0022480461f7" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" ToolTipResourseId="DashboardTooltip">
<SubArea Id="subarea_73c549e3" DescriptionResourceId="Dashboards_Description" Icon="/_imgs/imagestrips/transparent_spacer.gif" Url="/workplace/home_dashboards.aspx" DefaultDashboard="92186161-fad5-ee11-9079-0022480461f7" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
<Titles>
<Title LCID="1033" Title="Dashboards" />
</Titles>
Expand Down Expand Up @@ -42,22 +42,14 @@
</Titles>
</SubArea>
<SubArea Id="subarea_de6bed25" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementsubcategory" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_82128e59" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementappsettings" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_155f9003" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementattachment" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
</Group>
<Group Id="group_8ced7e46" ResourceId="SitemapDesigner.NewGroup" DescriptionResourceId="SitemapDesigner.NewGroup" IntroducedVersion="7.0.0.0" IsProfile="false" ToolTipResourseId="SitemapDesigner.Unknown">
<Titles>
<Title LCID="1033" Title="System" />
</Titles>
<SubArea Id="subarea_4604979c" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_employeeexperienceerror" 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_9e47e9b3" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_eelocalization" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA">
<Titles>
<Title LCID="1033" Title="Localizations" />
</Titles>
</SubArea>
<SubArea Id="subarea_ec719e1c" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="transactioncurrency" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
<SubArea Id="subarea_82128e59" Icon="/_imgs/imagestrips/transparent_spacer.gif" Entity="mpa_reimbursementappsettings" Client="All,Outlook,OutlookLaptopClient,OutlookWorkstationClient,Web" AvailableOffline="true" PassParams="false" Sku="All,OnPremise,Live,SPLA" />
</Group>
</Area>
</SiteMap>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@
<ClientType>4</ClientType>
<NavigationType>0</NavigationType>
<AppModuleComponents>
<AppModuleComponent type="1" schemaName="mpa_eelocalization" />
<AppModuleComponent type="1" schemaName="mpa_employeeexperienceerror" />
<AppModuleComponent type="1" schemaName="mpa_reimbursementappsettings" />
<AppModuleComponent type="1" schemaName="mpa_reimbursementattachment" />
<AppModuleComponent type="1" schemaName="mpa_reimbursementcategory" />
<AppModuleComponent type="1" schemaName="mpa_reimbursementprocess" />
<AppModuleComponent type="1" schemaName="mpa_reimbursementprogram" />
<AppModuleComponent type="1" schemaName="mpa_reimbursementrequest" />
<AppModuleComponent type="1" schemaName="mpa_reimbursementsubcategory" />
<AppModuleComponent type="1" schemaName="transactioncurrency" />
<AppModuleComponent type="1" schemaName="translationprocess" />
<AppModuleComponent type="26" id="{e55b0fbf-f6c4-43fa-b510-02655993c0f8}" />
<AppModuleComponent type="26" id="{798ed649-5997-4618-8bdb-07f7b75fd259}" />
<AppModuleComponent type="26" id="{2999b6d1-c7f2-4e76-bc4c-1407d3559fb4}" />
<AppModuleComponent type="26" id="{720e8d3c-28ac-4e54-8ac3-6f19a9ec4f72}" />
<AppModuleComponent type="26" id="{ee5b86eb-9b42-4f94-89e9-a7e52cf95895}" />
<AppModuleComponent type="29" id="{3f70d756-96d0-ee11-9079-0022480461f7}" />
<AppModuleComponent type="60" id="{92186161-fad5-ee11-9079-0022480461f7}" />
<AppModuleComponent type="60" id="{a1acefd3-1bac-ee11-be37-00224805c33a}" />
<AppModuleComponent type="60" id="{364af856-b560-ef11-bfe2-000d3a11233c}" />
<AppModuleComponent type="62" schemaName="mpa_refundrequestadministrator" />
</AppModuleComponents>
<AppModuleRoleMaps>
<Role id="{236750cd-45ae-4939-ab12-b24b920ced93}" />
<Role id="{b798943f-3df0-ed11-8849-0022480492d7}" />
<Role id="{f8d39a04-3df0-ed11-8849-0022480492d7}" />
<Role id="{0faae2a5-ed97-ee11-be37-00224805c33a}" />
<Role id="{a02e0e38-20c1-4046-becb-a5a48190fd6b}" />
<Role id="{627090ff-40a3-4053-8790-584edc5be201}" />
<Role id="{119f245c-3cc8-4b62-b31c-d1a046ced15d}" />
</AppModuleRoleMaps>
Expand Down
Loading

0 comments on commit e36825d

Please sign in to comment.