diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-01 19:38:01 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-03-01 19:38:01 -0800 |
| commit | bbebfbf5009526501d4a432c0ce7b0f8d325818c (patch) | |
| tree | a77971c8ced99bac678e5f520780284aa5d337ef /src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj | |
| parent | 9ffd411fa2115f5cdc4d2c0a473e55b0c82f7dc1 (diff) | |
| parent | 3ed1a19d2ba373869e5d1aa285726f3b5b99d0c2 (diff) | |
| download | DotNetOpenAuth-bbebfbf5009526501d4a432c0ce7b0f8d325818c.zip DotNetOpenAuth-bbebfbf5009526501d4a432c0ce7b0f8d325818c.tar.gz DotNetOpenAuth-bbebfbf5009526501d4a432c0ce7b0f8d325818c.tar.bz2 | |
Merge branch 'master' into webpages
Conflicts:
src/DotNetOpenAuth.sln
Diffstat (limited to 'src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj')
| -rw-r--r-- | src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj b/src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj index 43c478b..f4ac48c 100644 --- a/src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj +++ b/src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj @@ -18,6 +18,11 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> <ItemGroup> + <Compile Include="OAuth2\OAuth2Strings.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>OAuth2Strings.resx</DependentUpon> + </Compile> <Compile Include="OAuth2\ResourceServer.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> @@ -26,15 +31,21 @@ <Project>{60426312-6AE5-4835-8667-37EDEA670222}</Project> <Name>DotNetOpenAuth.Core</Name> </ProjectReference> - <ProjectReference Include="..\DotNetOpenAuth.OAuth.ServiceProvider\DotNetOpenAuth.OAuth.ServiceProvider.csproj"> - <Project>{FED1923A-6D70-49B5-A37A-FB744FEC1C86}</Project> - <Name>DotNetOpenAuth.OAuth.ServiceProvider</Name> + <ProjectReference Include="..\DotNetOpenAuth.OAuth.Common\DotNetOpenAuth.OAuth.Common.csproj"> + <Project>{115217C5-22CD-415C-A292-0DD0238CDD89}</Project> + <Name>DotNetOpenAuth.OAuth.Common</Name> </ProjectReference> <ProjectReference Include="..\DotNetOpenAuth.OAuth2\DotNetOpenAuth.OAuth2.csproj"> <Project>{56459A6C-6BA2-4BAC-A9C0-27E3BD961FA6}</Project> <Name>DotNetOpenAuth.OAuth2</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="OAuth2\OAuth2Strings.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>OAuth2Strings.Designer.cs</LastGenOutput> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> |