Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to the Latest Samples #202

Merged
merged 1 commit into from
Apr 3, 2020
Merged
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
4 changes: 2 additions & 2 deletions Samples/Common/Sample.Common/Sample.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<Import Project="$(MSBuildThisFileDirectory)..\..\Graph.props" />

<ItemGroup>
<PackageReference Include="Microsoft.Graph.Communications.Client" Version="1.2.0.1" />
<PackageReference Include="Microsoft.Graph.Communications.Core" Version="1.2.0.1" />
<PackageReference Include="Microsoft.Graph.Communications.Client" Version="1.2.0.791" />
<PackageReference Include="Microsoft.Graph.Communications.Core" Version="1.2.0.791" />
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.3" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.5.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@
<ItemGroup>
<Reference Include="Microsoft.Skype.Internal.Media.H264, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\Microsoft.Skype.Bots.Media\1.14.1.234-alpha\src\skype_media_lib\Microsoft.Skype.Internal.Media.H264.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Skype.Bots.Media\1.17.0.39-alpha\src\skype_media_lib\Microsoft.Skype.Internal.Media.H264.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.7" />
<PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0.1" />
<PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0.791" />
<PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.1" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.14.1.234-alpha" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.17.0.39-alpha" />
<Reference Include="System.Data.Entity" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Data.Services.Client" Version="5.8.4" />
<PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.1" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.14.1.234-alpha" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.17.0.39-alpha" />
<PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.3" />
<PackageReference Include="Microsoft.WindowsAzure.SDK" Version="2.9.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
Expand All @@ -48,6 +48,9 @@
<Compile Include="WorkerRole.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="VC_redist.x64.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="app.config">
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Graph.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.15.0.0" newVersion="1.15.0.0" />
<bindingRedirect oldVersion="0.0.0.0-1.20.0.0" newVersion="1.20.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Skype.Bots.Media" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.14.1.234" newVersion="1.14.1.234" />
<bindingRedirect oldVersion="0.0.0.0-1.17.0.39" newVersion="1.17.0.39" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
REM --- Move to this scripts location ---
pushd "%~dp0"

REM --- Ensure the VC_redist is installed for the Microsoft.Skype.Bots.Media Library ---
.\VC_redist.x64.exe /quiet

REM --- Print out environment variables for debugging ---
set

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<PackageReference Include="Microsoft.ServiceFabric.AspNetCore.HttpSys" Version="3.2.176" />
<!-- Although Bots.Media is implicitly imported by Calls.Media, this library requires an explicit reference for
some scripts included within the nuget package. -->
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.14.1.234-alpha" />
<PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0.1" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.17.0.39-alpha" />
<PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0.791" />
</ItemGroup>

<ItemGroup>
Expand All @@ -35,7 +35,10 @@

<ItemGroup>
<None Update="Startup.cmd">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="VC_redist.x64.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ pushd "%~dp0"
REM --- Print out environment variables for debugging ---
REM set Fabric

REM --- Ensure the VC_redist is installed for the Microsoft.Skype.Bots.Media Library ---
@echo off
set logfile=.\InstallCppRuntime-HueBot.log
.\VC_redist.x64.exe /quiet
echo %date% %time% ErrorLevel=%errorlevel% >> %logfile%

REM --- Register media perf dlls ---
powershell .\MediaPlatformStartupScript.bat

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\..\nuget.config = ..\..\nuget.config
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common.Beta", "..\..\Common\Sample.Common.Beta\Sample.Common.Beta.csproj", "{3268E59C-90DC-4D7B-97EA-A1DBB2716DF3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common", "..\..\Common\Sample.Common\Sample.Common.csproj", "{3268E59C-90DC-4D7B-97EA-A1DBB2716DF3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CRFrontEnd", "PolicyRecordingBot\FrontEnd\CRFrontEnd.csproj", "{739D09C4-47E8-42B7-9B89-94DCB890AC0F}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@
<ItemGroup>
<Reference Include="Microsoft.Skype.Internal.Media.H264, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\Microsoft.Skype.Bots.Media\1.14.1.234-alpha\src\skype_media_lib\Microsoft.Skype.Internal.Media.H264.dll</HintPath>
<HintPath>..\..\..\..\packages\Microsoft.Skype.Bots.Media\1.17.0.39-alpha\src\skype_media_lib\Microsoft.Skype.Internal.Media.H264.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.7" />
<PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0-beta.1" />
<PackageReference Include="Microsoft.Graph.Communications.Calls.Media" Version="1.2.0.791" />
<PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.1" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.14.1.234-alpha" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.17.0.39-alpha" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference Include="System.Data.Entity" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Common\Sample.Common.Beta\Sample.Common.Beta.csproj">
<ProjectReference Include="..\..\..\..\Common\Sample.Common\Sample.Common.csproj">
<Project>{88b67fbe-6de8-4dc3-83cf-9f6b4ea10138}</Project>
<Name>Sample.Common.Beta</Name>
<Name>Sample.Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Data.Services.Client" Version="5.8.4" />
<PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.1" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.14.1.234-alpha" />
<PackageReference Include="Microsoft.Skype.Bots.Media" Version="1.17.0.39-alpha" />
<PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.3" />
<PackageReference Include="Microsoft.WindowsAzure.SDK" Version="2.9.0" />
<PackageReference Include="WindowsAzure.Storage">
Expand All @@ -60,14 +60,19 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Common\Sample.Common.Beta\Sample.Common.Beta.csproj">
<ProjectReference Include="..\..\..\..\Common\Sample.Common\Sample.Common.csproj">
<Project>{88b67fbe-6de8-4dc3-83cf-9f6b4ea10138}</Project>
<Name>Sample.Common.Beta</Name>
<Name>Sample.Common</Name>
</ProjectReference>
<ProjectReference Include="..\FrontEnd\CRFrontEnd.csproj">
<Project>{739d09c4-47e8-42b7-9b89-94dcb890ac0f}</Project>
<Name>CRFrontEnd</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="VC_redist.x64.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Graph.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.15.0.0" newVersion="1.15.0.0" />
<bindingRedirect oldVersion="0.0.0.0-1.20.0.0" newVersion="1.20.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Skype.Bots.Media" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.14.1.234" newVersion="1.14.1.234" />
<bindingRedirect oldVersion="0.0.0.0-1.17.0.39" newVersion="1.17.0.39" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
Expand All @@ -78,6 +78,6 @@
<add key="BotName" value="%BotName%" />
<add key="AadAppId" value="%AppId%" />
<add key="AadAppSecret" value="%AppSecret%" />
<add key="PlaceCallEndpointUrl" value="https://graph.microsoft.com/beta" />
<add key="PlaceCallEndpointUrl" value="https://graph.microsoft.com/v1.0" />
</appSettings>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ pushd "%~dp0"
REM --- Print out environment variables for debugging ---
set

REM --- Ensure the VC_redist is installed for the Microsoft.Skype.Bots.Media Library ---
.\VC_redist.x64.exe /quiet /norestart

REM --- Delete existing certificate bindings and URL ACL registrations ---
netsh http delete sslcert ipport=%InstanceIpAddress%:%PrivateDefaultCallControlPort%
netsh http delete sslcert ipport=%InstanceIpAddress%:%PrivateInstanceCallControlPort%
Expand Down
2 changes: 1 addition & 1 deletion Samples/V1.0Samples/RemoteMediaSamples/IncidentBot.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IncidentBot", "IncidentBot\IncidentBot.csproj", "{FA70E97D-7018-4B08-A9D0-ABA9967AD7DC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common.Beta", "..\..\Common\Sample.Common.Beta\Sample.Common.Beta.csproj", "{3268E59C-90DC-4D7B-97EA-A1DBB2716DF3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common", "..\..\Common\Sample.Common\Sample.Common.csproj", "{3268E59C-90DC-4D7B-97EA-A1DBB2716DF3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ private void AddCallToHandlers(ICall call, IncidentCallContext incidentCallConte
var statusData = this.IncidentStatusManager.GetIncident(incidentCallContext.IncidentId);

CallHandler callHandler;
ParticipantInfo callee;
InvitationParticipantInfo callee;
switch (incidentCallContext.CallType)
{
case IncidentCallType.BotMeeting:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" />
<PackageReference Include="Microsoft.Graph.Communications.Calls" Version="1.2.0.1" />
<PackageReference Include="Microsoft.Graph.Communications.Calls" Version="1.2.0.791" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
<ProjectReference Include="..\..\..\Common\Sample.Common\Sample.Common.csproj" />
<Reference Include="System.Net.Http" />
Expand Down
31 changes: 31 additions & 0 deletions Samples/V1.0Samples/StatelessSamples/SimpleIvrBot.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29911.84
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleIvrBot", "SimpleIvrBot\SimpleIvrBot.csproj", "{89B2D455-60B7-4701-B30C-9F6C21FBE705}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Common", "..\..\Common\Sample.Common\Sample.Common.csproj", "{4FCDBE79-54CC-43F0-A6FC-674B5CD980E1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{89B2D455-60B7-4701-B30C-9F6C21FBE705}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89B2D455-60B7-4701-B30C-9F6C21FBE705}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89B2D455-60B7-4701-B30C-9F6C21FBE705}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89B2D455-60B7-4701-B30C-9F6C21FBE705}.Release|Any CPU.Build.0 = Release|Any CPU
{4FCDBE79-54CC-43F0-A6FC-674B5CD980E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FCDBE79-54CC-43F0-A6FC-674B5CD980E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FCDBE79-54CC-43F0-A6FC-674B5CD980E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FCDBE79-54CC-43F0-A6FC-674B5CD980E1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9076CB49-69D5-400A-9C2C-88AD1AC400A9}
EndGlobalSection
EndGlobal
Loading