Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

Commit e64dad8

Browse files
mmena1mmena1
committed
Update dependencies and add some config stuff
1 parent 8923525 commit e64dad8

File tree

7 files changed

+122
-54
lines changed

7 files changed

+122
-54
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Ignore Web.config, which contains app keys
2-
VideoAccessTokenServer/Web.config
1+
# Ignore Local.config, which contains app keys
2+
VideoAccessTokenServer/Local.config
33

44
## Ignore Visual Studio temporary files, build results, and
55
## files generated by popular Visual Studio add-ons.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ or possibly your system environment variables.
2020

2121
## Setting up the Application
2222

23-
After downloading the repo, copy the `VideoAccessTokenServer/Web.config.example` to `Web.config` in the same directory. Next, open up `VideoAccessTokenServer.sln` in Visual Studio. Edit `Web.config` with the three values we obtained above:
23+
After downloading the repo, copy the `VideoAccessTokenServer/Local.config.example` to `Local.config` in the same directory. Next, open up `VideoAccessTokenServer.sln` in Visual Studio. Edit `Local.config` with the three values we obtained above:
2424

2525
```xml
2626
<appSettings>

‎VideoAccessTokenServer/.mergify‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
pull_request_rules:
2+
- name: automatic merge for Dependabot pull requests
3+
conditions:
4+
- author=dependabot-preview[bot]
5+
- status-success=build
6+
actions:
7+
merge:
8+
method: squash

‎VideoAccessTokenServer/Local.config.example‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0"?>
2+
<appSettings>
3+
<add key="TwilioAccountSid" value="AC6c7c7b24e9ef4b6090c9ddcf9a76ef25" />
4+
<add key="TwilioApiKey" value="SKe38940f285b7f7249b98c44429695e16" />
5+
<add key="TwilioApiSecret" value="ljakshdposjfnbhdshjifbsdhjkfhsbvdijsdif" />
6+
</appSettings>

‎VideoAccessTokenServer/VideoAccessTokenServer.csproj‎

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
4-
<Import Project="..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" />
3+
<Import Project="..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props')" />
54
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
65
<PropertyGroup>
76
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -24,6 +23,7 @@
2423
<UseGlobalApplicationHostFile />
2524
<NuGetPackageImportStamp>
2625
</NuGetPackageImportStamp>
26+
<Use64BitIISExpress />
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2929
<DebugSymbols>true</DebugSymbols>
@@ -43,27 +43,27 @@
4343
<WarningLevel>4</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
48-
<Private>True</Private>
46+
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
4948
</Reference>
5049
<Reference Include="Microsoft.CSharp" />
51-
<Reference Include="Microsoft.IdentityModel.Logging, Version=1.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Microsoft.IdentityModel.Logging.1.1.2\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
53-
<Private>True</Private>
50+
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.6.8.0\lib\net45\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
5452
</Reference>
55-
<Reference Include="Microsoft.IdentityModel.Tokens, Version=5.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Microsoft.IdentityModel.Tokens.5.1.2\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
57-
<Private>True</Private>
53+
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.8.0\lib\net45\Microsoft.IdentityModel.Logging.dll</HintPath>
5855
</Reference>
59-
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
61-
<Private>True</Private>
56+
<Reference Include="Microsoft.IdentityModel.Tokens, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Microsoft.IdentityModel.Tokens.6.8.0\lib\net45\Microsoft.IdentityModel.Tokens.dll</HintPath>
6258
</Reference>
63-
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.5.1.2\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
65-
<Private>True</Private>
59+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6661
</Reference>
62+
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.6.8.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll</HintPath>
64+
</Reference>
65+
<Reference Include="System.Net" />
66+
<Reference Include="System.Net.Http" />
6767
<Reference Include="System.Web.DynamicData" />
6868
<Reference Include="System.Web.Entity" />
6969
<Reference Include="System.Web.ApplicationServices" />
@@ -73,40 +73,39 @@
7373
<Reference Include="System.Core" />
7474
<Reference Include="System.Data.DataSetExtensions" />
7575
<Reference Include="System.Web.Extensions" />
76+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
78+
</Reference>
79+
<Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
81+
</Reference>
82+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
84+
</Reference>
85+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
87+
</Reference>
88+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
89+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
90+
</Reference>
91+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
93+
</Reference>
7694
<Reference Include="System.Xml.Linq" />
7795
<Reference Include="System.Drawing" />
7896
<Reference Include="System.Web" />
7997
<Reference Include="System.Xml" />
8098
<Reference Include="System.Configuration" />
8199
<Reference Include="System.Web.Services" />
82100
<Reference Include="System.EnterpriseServices" />
83-
<Reference Include="Twilio, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Twilio.5.4.0\lib\net451\Twilio.dll</HintPath>
85-
<Private>True</Private>
101+
<Reference Include="Twilio, Version=5.52.1.0, Culture=neutral, processorArchitecture=MSIL">
102+
<HintPath>..\packages\Twilio.5.52.1\lib\net451\Twilio.dll</HintPath>
86103
</Reference>
87104
</ItemGroup>
88105
<ItemGroup>
89-
<Reference Include="System.Web.Razor">
90-
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
91-
</Reference>
92-
<Reference Include="System.Web.Webpages">
93-
<HintPath>..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.dll</HintPath>
94-
</Reference>
95-
<Reference Include="System.Web.Webpages.Deployment">
96-
<HintPath>..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.Deployment.dll</HintPath>
97-
</Reference>
98-
<Reference Include="System.Web.Webpages.Razor">
99-
<HintPath>..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.Razor.dll</HintPath>
100-
</Reference>
101-
<Reference Include="System.Web.Helpers">
102-
<HintPath>..\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
103-
</Reference>
104106
<Reference Include="Microsoft.Web.Infrastructure">
105107
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
106108
</Reference>
107-
<Reference Include="System.Web.Mvc">
108-
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
109-
</Reference>
110109
</ItemGroup>
111110
<ItemGroup>
112111
<Content Include="Global.asax" />
@@ -123,6 +122,8 @@
123122
<ItemGroup>
124123
<Content Include="Views\web.config" />
125124
<Content Include="packages.config" />
125+
<Content Include="Local.config" />
126+
<None Include="Local.config.example" />
126127
<None Include="Web.Debug.config">
127128
<DependentUpon>Web.config</DependentUpon>
128129
</None>
@@ -160,12 +161,13 @@
160161
</FlavorProperties>
161162
</VisualStudio>
162163
</ProjectExtensions>
164+
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" />
163165
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
164166
<PropertyGroup>
165167
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
166168
</PropertyGroup>
167-
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props'))" />
168-
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
169+
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets'))" />
170+
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props'))" />
169171
</Target>
170172
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
171173
Other similar extension points exist, see Microsoft.Common.targets.

‎VideoAccessTokenServer/Web.config‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
For more information on how to configure your ASP.NET application, please visit
4+
http://go.microsoft.com/fwlink/?LinkId=301880
5+
-->
6+
<configuration>
7+
<appSettings file="Local.config">
8+
<add key="webpages:Version" value="3.0.0.0" />
9+
<add key="webpages:Enabled" value="false" />
10+
<add key="ClientValidationEnabled" value="true" />
11+
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
12+
</appSettings>
13+
<system.web>
14+
<compilation debug="true" targetFramework="4.5.2" />
15+
<httpRuntime targetFramework="4.5.2" />
16+
</system.web>
17+
<runtime>
18+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
19+
<dependentAssembly>
20+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
21+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
22+
</dependentAssembly>
23+
<dependentAssembly>
24+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
25+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
26+
</dependentAssembly>
27+
<dependentAssembly>
28+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
29+
<bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
30+
</dependentAssembly>
31+
<dependentAssembly>
32+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
33+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
34+
</dependentAssembly>
35+
<dependentAssembly>
36+
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
37+
<bindingRedirect oldVersion="0.0.0.0-6.8.0.0" newVersion="6.8.0.0" />
38+
</dependentAssembly>
39+
<dependentAssembly>
40+
<assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
41+
<bindingRedirect oldVersion="0.0.0.0-6.8.0.0" newVersion="6.8.0.0" />
42+
</dependentAssembly>
43+
</assemblyBinding>
44+
</runtime>
45+
<system.codedom>
46+
<compilers>
47+
<compiler extension=".cs" language="c#;cs;csharp" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
48+
<compiler extension=".vb" language="vb;vbs;visualbasic;vbscript" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008,40000,40008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
49+
</compilers>
50+
</system.codedom>
51+
</configuration>

‎VideoAccessTokenServer/packages.config‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
4-
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
5-
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
6-
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net452" />
7-
<package id="Microsoft.IdentityModel.Logging" version="1.1.2" targetFramework="net452" />
8-
<package id="Microsoft.IdentityModel.Tokens" version="5.1.2" targetFramework="net452" />
9-
<package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
3+
<package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net452" />
4+
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net452" />
5+
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net452" />
6+
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.6.0" targetFramework="net452" />
7+
<package id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" targetFramework="net452" />
8+
<package id="Microsoft.IdentityModel.Logging" version="6.8.0" targetFramework="net452" />
9+
<package id="Microsoft.IdentityModel.Tokens" version="6.8.0" targetFramework="net452" />
10+
<package id="Microsoft.Net.Compilers" version="3.8.0" targetFramework="net452" developmentDependency="true" />
1011
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
11-
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
12-
<package id="System.IdentityModel.Tokens.Jwt" version="5.1.2" targetFramework="net452" />
13-
<package id="Twilio" version="5.4.0" targetFramework="net452" />
14-
</packages>
12+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
13+
<package id="System.IdentityModel.Tokens.Jwt" version="6.8.0" targetFramework="net452" />
14+
<package id="Twilio" version="5.52.1" targetFramework="net452" />
15+
</packages>

0 commit comments

Comments
 (0)