Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-complete-samples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- project_path: 'samples/app-checkin-location/csharp/AppCheckinLocation/AppCheckinLocation.csproj'
name: 'app-checkin-location'
version: '6.0.x'
version: '10.0.x'

- project_path: 'samples/app-installation-using-qr-code/csharp/QRAppInstallation/QRAppInstallation.csproj'
name: 'app-installation-using-qr-code'
Expand Down
37 changes: 0 additions & 37 deletions samples/app-checkin-location/csharp/AppCheckinLocation.sln

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,31 +1,52 @@
[
{
"Name": "Microsoft Teams (browser)",
"Name": "Microsoft 365 Agents Playground (browser)",
"Projects": [
{
"Path": "M365Agent\\M365Agent.atkproj",
"Name": "M365Agent\\M365Agent.atkproj",
"Action": "StartWithoutDebugging",
"DebugTarget": "Microsoft 365 Agents Playground (browser)"
},
{
"Path": "AppCheckinLocation\\AppCheckinLocation.csproj",
"Name": "AppCheckinLocation\\AppCheckinLocation.csproj",
"Action": "Start",
"DebugTarget": "Start Project"
},
"DebugTarget": "Microsoft 365 Agents Playground"
}
]
},
{
"Name": "Microsoft Teams (browser)",
"Projects": [
{
"Path": "M365Agent\\M365Agent.ttkproj",
"Path": "M365Agent\\M365Agent.atkproj",
"Name": "M365Agent\\M365Agent.atkproj",
"Action": "StartWithoutDebugging",
"DebugTarget": "Microsoft Teams (browser)"
},
{
"Path": "AppCheckinLocation\\AppCheckinLocation.csproj",
"Name": "AppCheckinLocation\\AppCheckinLocation.csproj",
"Action": "Start",
"DebugTarget": "Start Project"
}
]
},
{
"Name": "Microsoft Teams (browser) (skip update app)",
"Projects": [
{
"Path": "M365Agent\\M365Agent.atkproj",
"Name": "M365Agent\\M365Agent.atkproj",
"Action": "StartWithoutDebugging",
"DebugTarget": "Microsoft Teams (browser) (skip update app)"
},
{
"Path": "AppCheckinLocation\\AppCheckinLocation.csproj",
"Name": "AppCheckinLocation\\AppCheckinLocation.csproj",
"Action": "Start",
"DebugTarget": "Start Project"
},
{
"Path": "M365Agent\\M365Agent.ttkproj",
"Action": "StartWithoutDebugging",
"DebugTarget": "Microsoft Teams (browser) (skip update app)"
}
]
}
Expand Down
6 changes: 6 additions & 0 deletions samples/app-checkin-location/csharp/AppCheckinLocation.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Solution>
<Project Path="AppCheckinLocation/AppCheckinLocation.csproj" />
<Project Path="M365Agent/M365Agent.atkproj" Type="a9e3f50b-275e-4af7-adce-8be12d41e305">
<Deploy />
</Project>
</Solution>
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,8 @@ bld/
[Ll]og/

# Notification local store
.notification.localstore.json
.notification.localstore.json
.notification.playgroundstore.json

# devTools
devTools/

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>latest</LangVersion>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AdaptiveCards" Version="2.7.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.11" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.18.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.18.1" />
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Microsoft.Teams.Api" Version="2.0.*" />
<PackageReference Include="Microsoft.Teams.Apps" Version="2.0.*" />
<PackageReference Include="Microsoft.Teams.Plugins.AspNetCore" Version="2.0.*" />
<PackageReference Include="Microsoft.Teams.Common" Version="2.0.*" />
</ItemGroup>

<ItemGroup>
<Content Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<!-- Exclude local settings from publish -->
<ItemGroup>
<Content Remove="appsettings.Development.json" />
<Content Include="appsettings.Development.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>None</CopyToPublishDirectory>
</Content>
<Content Remove="appsettings.Playground.json" />
<Content Include="appsettings.Playground.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>None</CopyToPublishDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<Folder Include="Images\" />
</ItemGroup>

</Project>
</Project>
Loading