Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit 165e5b7

Browse files
davidbritchdavidbritch
authored
Fix ResourceTokenBroker (#645)
* Restored original files. * Updates.
1 parent 32bc9dc commit 165e5b7

File tree

2 files changed

+117
-46
lines changed

2 files changed

+117
-46
lines changed

‎WebServices/TodoDocumentDBAuth/ResourceTokenBroker/ResourceTokenBroker/ResourceTokenBroker.csproj‎

Lines changed: 77 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.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')" />
35
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
68
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProductVersion />
9+
<ProductVersion>
10+
</ProductVersion>
811
<SchemaVersion>2.0</SchemaVersion>
912
<ProjectGuid>{C4233D06-E76E-4459-8D44-B9DDBEB4369C}</ProjectGuid>
1013
<ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -20,7 +23,9 @@
2023
<IISExpressWindowsAuthentication />
2124
<IISExpressUseClassicPipelineMode />
2225
<UseGlobalApplicationHostFile />
23-
<NuGetPackageImportStamp />
26+
<NuGetPackageImportStamp>
27+
</NuGetPackageImportStamp>
28+
<Use64BitIISExpress />
2429
</PropertyGroup>
2530
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2631
<DebugSymbols>true</DebugSymbols>
@@ -40,46 +45,19 @@
4045
<WarningLevel>4</WarningLevel>
4146
</PropertyGroup>
4247
<ItemGroup>
43-
<PackageReference Include="Antlr" Version="3.4.1.9004" />
44-
<PackageReference Include="bootstrap" Version="3.0.0" />
45-
<PackageReference Include="EntityFramework" Version="6.1.3" />
46-
<PackageReference Include="jQuery" Version="1.10.2" />
47-
<PackageReference Include="jQuery.Validation" Version="1.11.1" />
48-
<PackageReference Include="Microsoft.AspNet.Identity.Core" Version="2.2.1" />
49-
<PackageReference Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.1" />
50-
<PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.1" />
51-
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
52-
<PackageReference Include="Microsoft.AspNet.Razor" Version="3.2.3" />
53-
<PackageReference Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
54-
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.3" />
55-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
56-
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
57-
<PackageReference Include="Microsoft.AspNet.WebApi.HelpPage" Version="5.2.3" />
58-
<PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.3" />
59-
<PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.3" />
60-
<PackageReference Include="Microsoft.AspNet.WebPages" Version="3.2.3" />
61-
<PackageReference Include="Microsoft.Azure.DocumentDB" Version="1.11.0" />
62-
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="1.0.0" />
63-
<PackageReference Include="Microsoft.jQuery.Unobtrusive.Validation" Version="3.2.3" />
64-
<PackageReference Include="Microsoft.Net.Compilers" Version="1.0.0" />
65-
<PackageReference Include="Microsoft.Owin" Version="3.0.1" />
66-
<PackageReference Include="Microsoft.Owin.Host.SystemWeb" Version="3.0.1" />
67-
<PackageReference Include="Microsoft.Owin.Security" Version="3.0.1" />
68-
<PackageReference Include="Microsoft.Owin.Security.Cookies" Version="3.0.1" />
69-
<PackageReference Include="Microsoft.Owin.Security.Facebook" Version="3.0.1" />
70-
<PackageReference Include="Microsoft.Owin.Security.Google" Version="3.0.1" />
71-
<PackageReference Include="Microsoft.Owin.Security.MicrosoftAccount" Version="3.0.1" />
72-
<PackageReference Include="Microsoft.Owin.Security.OAuth" Version="3.0.1" />
73-
<PackageReference Include="Microsoft.Owin.Security.Twitter" Version="3.0.1" />
74-
<PackageReference Include="Microsoft.Web.Infrastructure" Version="1.0.0.0" />
75-
<PackageReference Include="Modernizr" Version="2.6.2" />
76-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
77-
<PackageReference Include="Owin" Version="1.0" />
78-
<PackageReference Include="Respond" Version="1.2.0" />
79-
<PackageReference Include="WebGrease" Version="1.5.2" />
80-
</ItemGroup>
81-
<ItemGroup>
48+
<Reference Include="Microsoft.Azure.Documents.Client, Version=1.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Microsoft.Azure.DocumentDB.1.11.0\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
50+
<Private>True</Private>
51+
</Reference>
52+
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
54+
<Private>True</Private>
55+
</Reference>
8256
<Reference Include="Microsoft.CSharp" />
57+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
58+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
59+
<Private>True</Private>
60+
</Reference>
8361
<Reference Include="System" />
8462
<Reference Include="System.Data" />
8563
<Reference Include="System.Drawing" />
@@ -95,11 +73,50 @@
9573
<Reference Include="System.Xml" />
9674
<Reference Include="System.Configuration" />
9775
<Reference Include="System.Runtime.Serialization" />
98-
<Reference Include="System.Net.Http" />
99-
<Reference Include="System.Net.Http.WebRequest" />
76+
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77+
<Private>True</Private>
78+
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
79+
</Reference>
80+
<Reference Include="System.Net.Http">
81+
</Reference>
82+
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
84+
</Reference>
85+
<Reference Include="System.Net.Http.WebRequest">
86+
</Reference>
87+
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88+
<Private>True</Private>
89+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
90+
</Reference>
91+
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
92+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
93+
</Reference>
94+
<Reference Include="System.Web.Http.WebHost, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
95+
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
96+
</Reference>
97+
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98+
<Private>True</Private>
99+
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
100+
</Reference>
100101
<Reference Include="System.Web.Optimization">
101102
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
102103
</Reference>
104+
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
105+
<Private>True</Private>
106+
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
107+
</Reference>
108+
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
109+
<Private>True</Private>
110+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
111+
</Reference>
112+
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
113+
<Private>True</Private>
114+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
115+
</Reference>
116+
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117+
<Private>True</Private>
118+
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
119+
</Reference>
103120
<Reference Include="WebGrease">
104121
<Private>True</Private>
105122
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
@@ -233,7 +250,6 @@
233250
<Content Include="Areas\HelpPage\Views\Help\DisplayTemplates\ApiGroup.cshtml" />
234251
<Content Include="Areas\HelpPage\Views\Help\Api.cshtml" />
235252
<None Include="Properties\PublishProfiles\todo-tokenbroker - Web Deploy.pubxml" />
236-
<None Include="Properties\PublishProfiles\xamarindocumentdb - Web Deploy.pubxml" />
237253
<None Include="Scripts\jquery-1.10.2.intellisense.js" />
238254
<Content Include="Scripts\jquery-1.10.2.js" />
239255
<Content Include="Scripts\jquery-1.10.2.min.js" />
@@ -272,6 +288,8 @@
272288
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
273289
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
274290
</PropertyGroup>
291+
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
292+
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
275293
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
276294
<Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
277295
<AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
@@ -287,13 +305,26 @@
287305
<IISUrl>http://localhost:18526/</IISUrl>
288306
<NTLMAuthentication>False</NTLMAuthentication>
289307
<UseCustomServer>False</UseCustomServer>
290-
<CustomServerUrl />
308+
<CustomServerUrl>
309+
</CustomServerUrl>
291310
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
292311
</WebProjectProperties>
293312
</FlavorProperties>
294313
</VisualStudio>
295314
</ProjectExtensions>
296315
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
297-
<PropertyGroup />
316+
<PropertyGroup>
317+
<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>
318+
</PropertyGroup>
319+
<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'))" />
320+
<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'))" />
321+
<Error Condition="!Exists('..\packages\Microsoft.Azure.DocumentDB.1.11.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Azure.DocumentDB.1.11.0\build\Microsoft.Azure.DocumentDB.targets'))" />
322+
</Target>
323+
<Import Project="..\packages\Microsoft.Azure.DocumentDB.1.11.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\packages\Microsoft.Azure.DocumentDB.1.11.0\build\Microsoft.Azure.DocumentDB.targets')" />
324+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
325+
Other similar extension points exist, see Microsoft.Common.targets.
326+
<Target Name="BeforeBuild">
298327
</Target>
328+
<Target Name="AfterBuild">
329+
</Target> -->
299330
</Project>

‎WebServices/TodoDocumentDBAuth/ResourceTokenBroker/ResourceTokenBroker/packages.config‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Antlr" version="3.4.1.9004" targetFramework="net452" />
4+
<package id="bootstrap" version="3.0.0" targetFramework="net452" />
5+
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
6+
<package id="jQuery" version="1.10.2" targetFramework="net452" />
7+
<package id="jQuery.Validation" version="1.11.1" targetFramework="net452" />
8+
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net452" />
9+
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net452" />
10+
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net452" />
11+
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" />
12+
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" />
13+
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net452" />
14+
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
15+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
16+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
17+
<package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.3" targetFramework="net452" />
18+
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
19+
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
20+
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" />
21+
<package id="Microsoft.Azure.DocumentDB" version="1.11.0" targetFramework="net452" />
22+
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net452" />
23+
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.2.3" targetFramework="net452" />
24+
<package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
25+
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
26+
<package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net452" />
27+
<package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net452" />
28+
<package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net452" />
29+
<package id="Microsoft.Owin.Security.Facebook" version="3.0.1" targetFramework="net452" />
30+
<package id="Microsoft.Owin.Security.Google" version="3.0.1" targetFramework="net452" />
31+
<package id="Microsoft.Owin.Security.MicrosoftAccount" version="3.0.1" targetFramework="net452" />
32+
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net452" />
33+
<package id="Microsoft.Owin.Security.Twitter" version="3.0.1" targetFramework="net452" />
34+
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
35+
<package id="Modernizr" version="2.6.2" targetFramework="net452" />
36+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
37+
<package id="Owin" version="1.0" targetFramework="net452" />
38+
<package id="Respond" version="1.2.0" targetFramework="net452" />
39+
<package id="WebGrease" version="1.5.2" targetFramework="net452" />
40+
</packages>

0 commit comments

Comments
 (0)