Skip to content

Commit

Permalink
Merge pull request #98 from microsoft/users/deepthi/awardsfix
Browse files Browse the repository at this point in the history
Awards and Recognition/Leave management name and description changes
  • Loading branch information
deepthimk123 authored Nov 18, 2024
2 parents e77e7ef + 51387ad commit 613d0d4
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 39 deletions.
Binary file not shown.
Binary file not shown.
Binary file modified AppSourcePackages/mpa_AwardsRecognitionCopilot/package.zip
Binary file not shown.
Binary file not shown.
Binary file modified AppSourcePackages/mpa_LeaveManagement/package.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion Solutions/mpa_LeaveManagement/mpa_LeaveManagement.cdsproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<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>bfd8f9f8-d3f4-430d-ba02-52ce0b23cbcf</ProjectGuid>
<ProjectGuid>b056f769-b4fc-436b-99e0-23a418b0626e</ProjectGuid>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<!--Remove TargetFramework when this is available in 16.1-->
<TargetFramework>net462</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion Solutions/mpa_LeaveManagement/src/Other/Customizations.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ImportExportXml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" OrganizationVersion="9.2.24091.198" OrganizationSchemaType="Standard" CRMServerServiceabilityVersion="9.2.24091.00198">
<ImportExportXml xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" OrganizationVersion="9.2.24101.200" OrganizationSchemaType="Standard" CRMServerServiceabilityVersion="9.2.24101.00200">
<Entities />
<Roles />
<Workflows />
Expand Down
8 changes: 5 additions & 3 deletions Solutions/mpa_LeaveManagement/src/Other/Solution.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<ImportExportXml version="9.2.24091.198" SolutionPackageVersion="9.2" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" OrganizationVersion="9.2.24091.198" OrganizationSchemaType="Standard" CRMServerServiceabilityVersion="9.2.24091.00198">
<ImportExportXml version="9.2.24101.200" SolutionPackageVersion="9.2" languagecode="1033" generatedBy="CrmLive" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" OrganizationVersion="9.2.24101.200" OrganizationSchemaType="Standard" CRMServerServiceabilityVersion="9.2.24101.00200">
<SolutionManifest>
<UniqueName>mpa_LeaveManagement</UniqueName>
<LocalizedNames>
<LocalizedName description="Leave Management" languagecode="1033" />
</LocalizedNames>
<Descriptions>
<Description description="Leave Management Copilot is intended to simplify the process of requesting time off from your manager. The copilot can facilitate the requests and the approval process, while helping managers and reports review the future time off requests and hour balances by type. The is also and administrative component built into a Model Driven App." languagecode="1033" />
<Description description="Streamline the time-off process for employees with AI-assisted leave requests and policy inquiry answers." languagecode="1033" />
</Descriptions>
<Version>1.0.0.5</Version>
<Managed>2</Managed>
Expand Down Expand Up @@ -100,7 +100,9 @@
<Dependent type="80" schemaName="mpa_LeaveManagementAdmin" displayName="Leave Management Administration App" />
</MissingDependency>
<MissingDependency>
<Required type="SettingDefinition" displayName="AppChannel" solution="msdyn_AppFrameworkInfraExtensions (1.0.0.12)" id.uniquename="AppChannel" />
<Required type="SettingDefinition" displayName="AppChannel" solution="msdyn_AppFrameworkInfraExtensions (1.0.0.12)" id.uniquename="AppChannel">
<package>PowerAppsAppFramework_Anchor (1.0.0.16)</package>
</Required>
<Dependent type="AppSetting" displayName="parentappmoduleid.uniquename=mpa_LeaveManagementAdmin,settingdefinitionid.uniquename=AppChannel" id.parentappmoduleid.uniquename="mpa_LeaveManagementAdmin" id.settingdefinitionid.uniquename="AppChannel" />
</MissingDependency>
</MissingDependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"properties": {
"connectionReferences": {
"shared_commondataserviceforapps_1": {
"shared_commondataserviceforapps": {
"impersonation": {
"source": "invoker"
},
"runtimeSource": "embedded",
"connection": {
"connectionReferenceLogicalName": "mpa_LeaveManagementDataverse"
Expand All @@ -10,17 +13,17 @@
"name": "shared_commondataserviceforapps"
}
},
"shared_teams_1": {
"runtimeSource": "embedded",
"shared_teams": {
"runtimeSource": "invoker",
"connection": {
"connectionReferenceLogicalName": "mpa_LeaveManagementMicrosoftTeams"
},
"api": {
"name": "shared_teams"
}
},
"shared_office365_1": {
"runtimeSource": "embedded",
"shared_office365": {
"runtimeSource": "invoker",
"connection": {
"connectionReferenceLogicalName": "mpa_LeaveManagementO365Outlook"
},
Expand Down Expand Up @@ -196,7 +199,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "CreateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -270,7 +273,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "UpdateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -334,7 +337,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "UpdateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -374,7 +377,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "CreateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -429,7 +432,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "ListRecords",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand All @@ -452,7 +455,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "UpdateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -556,7 +559,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "UpdateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -585,7 +588,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "ListRecords",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand All @@ -608,7 +611,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "UpdateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -755,7 +758,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "UpdateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand All @@ -778,7 +781,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "ListRecords",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand All @@ -801,7 +804,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "UpdateRecord",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -920,7 +923,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "GetItem",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand All @@ -944,7 +947,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "GetItem",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand All @@ -968,7 +971,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "ListRecords",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down Expand Up @@ -1114,7 +1117,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_teams_1",
"connectionName": "shared_teams",
"operationId": "PostCardToConversation",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_teams"
},
Expand Down Expand Up @@ -1219,7 +1222,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_teams_1",
"connectionName": "shared_teams",
"operationId": "PostCardToConversation",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_teams"
},
Expand Down Expand Up @@ -1334,7 +1337,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_teams_1",
"connectionName": "shared_teams",
"operationId": "PostCardToConversation",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_teams"
},
Expand Down Expand Up @@ -1436,7 +1439,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_teams_1",
"connectionName": "shared_teams",
"operationId": "PostCardToConversation",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_teams"
},
Expand Down Expand Up @@ -1538,7 +1541,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_teams_1",
"connectionName": "shared_teams",
"operationId": "PostCardToConversation",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_teams"
},
Expand Down Expand Up @@ -1659,7 +1662,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_office365_1",
"connectionName": "shared_office365",
"operationId": "SendEmailV2",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_office365"
},
Expand Down Expand Up @@ -1696,7 +1699,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_office365_1",
"connectionName": "shared_office365",
"operationId": "SendEmailV2",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_office365"
},
Expand Down Expand Up @@ -1812,7 +1815,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "GetItem",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand All @@ -1835,7 +1838,7 @@
"type": "OpenApiConnection",
"inputs": {
"host": {
"connectionName": "shared_commondataserviceforapps_1",
"connectionName": "shared_commondataserviceforapps",
"operationId": "PerformUnboundAction",
"apiId": "/providers/Microsoft.PowerApps/apis/shared_commondataserviceforapps"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<botcomponent schemaname="mpa_LeaveManagement.gpt.default">
<componenttype>15</componenttype>
<description>Leave Management Copilot is intended to simplify the process of requesting time off from your manager. The copilot can facilitate the requests and the approval process, while helping managers and reports review the future time off requests and hour balances by type. The is also and administrative component built into a Model Driven App.</description>
<description>Leave Management is intended to simplify the process of requesting time off from your manager. The agent can facilitate the requests and the approval process, while helping managers and reports review the future time off requests and hour balances by type. The is also an administrative component built into a Model Driven App.</description>
<iscustomizable>1</iscustomizable>
<name>Leave Management</name>
<parentbotid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ beginDialog:

These are just a few examples to get you started. What would you like to do today?

_**Note**: You can now customize this copilot's topics and knowledge for your own needs. For more information about this template and how to modify it, visit the template [documentation.](https://go.microsoft.com/fwlink/?linkid=2281584)_
_**Note**: You can now customize this agent's topics and knowledge for your own needs. For more information about this template and how to modify it, visit the template [documentation.](https://go.microsoft.com/fwlink/?linkid=2281584)_

- kind: ConditionGroup
id: oCt3Hq
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
<synchronizationstatus>{
"contentVersion": 2,
"lastFinishedPublishOperation": {
"operationStart": "2024-08-30T16:45:35.6186078Z",
"operationEnd": "2024-08-30T16:45:59.8618777Z",
"$kind": "PublishResultDetails",
"operationStart": "2024-10-30T05:05:52.036652Z",
"operationEnd": "2024-10-30T05:06:41.1039852Z",
"status": "Succeeded"
},
"currentSynchronizationState": {
Expand All @@ -22,7 +23,7 @@
"provisioningStatus": "Provisioned",
"state": "Synchronized"
},
"lastSynchronizedOnUtc": "2024-08-30T16:47:10.3152545Z"
"lastSynchronizedOnUtc": "2024-11-12T19:36:20.9124393Z"
}</synchronizationstatus>
<template>default-2.1.0</template>
<timezoneruleversionnumber>4</timezoneruleversionnumber>
Expand Down

0 comments on commit 613d0d4

Please sign in to comment.