Skip to content
This repository was archived by the owner on Mar 20, 2019. It is now read-only.

Commit 357785c

Browse files
AArnottAArnott
committed
Fixes up some missing references.
Upgrades MVC dependency from 1.0 to 3.0, via NuGet.
1 parent 0f17e9f commit 357785c

29 files changed

Lines changed: 162 additions & 34 deletions

‎projecttemplates/MvcRelyingParty/MvcRelyingParty.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<IISExpressWindowsAuthentication />
1111
<IISExpressUseClassicPipelineMode />
1212
<TargetFrameworkProfile />
13+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
1314
</PropertyGroup>
1415
<PropertyGroup>
1516
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,9 +46,9 @@
4546
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4647
</PropertyGroup>
4748
<ItemGroup>
48-
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
49+
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
4950
<SpecificVersion>False</SpecificVersion>
50-
<HintPath>..\..\lib\log4net.dll</HintPath>
51+
<HintPath>..\..\src\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
5152
</Reference>
5253
<Reference Include="System" />
5354
<Reference Include="System.Data" />
@@ -234,6 +235,9 @@
234235
<ItemGroup>
235236
<Content Include="OAuthTokenEndpoint.ashx" />
236237
</ItemGroup>
238+
<ItemGroup>
239+
<Content Include="packages.config" />
240+
</ItemGroup>
237241
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
238242
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
239243
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
@@ -264,4 +268,5 @@
264268
</VisualStudio>
265269
</ProjectExtensions>
266270
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
271+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
267272
</Project>

‎projecttemplates/MvcRelyingParty/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="log4net" version="2.0.0" targetFramework="net45" />
4+
</packages>

‎projecttemplates/RelyingPartyLogic/RelyingPartyLogic.csproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@
5555
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5656
</PropertyGroup>
5757
<ItemGroup>
58-
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
59-
<SpecificVersion>False</SpecificVersion>
60-
<HintPath>..\..\lib\log4net.dll</HintPath>
61-
</Reference>
6258
<Reference Include="Microsoft.SqlServer.ConnectionInfo" />
6359
<Reference Include="Microsoft.SqlServer.Smo" />
6460
<Reference Include="Microsoft.SqlServer.Management.Sdk.Sfc" />
@@ -230,7 +226,7 @@
230226
</ItemGroup>
231227
<Target Name="CopySqlDeployScript">
232228
<MSBuild Projects="..\RelyingPartyDatabase\RelyingPartyDatabase.sqlproj" Targets="GetDeployScriptPath">
233-
<Output TaskParameter="TargetOutputs" PropertyName="SqlDeployScriptPath"/>
229+
<Output TaskParameter="TargetOutputs" PropertyName="SqlDeployScriptPath" />
234230
</MSBuild>
235231
<Copy SourceFiles="$(SqlDeployScriptPath)" DestinationFiles="CreateDatabase.sql" />
236232
</Target>
@@ -242,12 +238,12 @@
242238
<Target Name="AfterBuild">
243239
</Target>
244240
-->
245-
<PropertyGroup>
246-
<PrepareResourceNamesDependsOn>
241+
<PropertyGroup>
242+
<PrepareResourceNamesDependsOn>
247243
CopySqlDeployScript;
248244
$(PrepareResourceNamesDependsOn)
249245
</PrepareResourceNamesDependsOn>
250-
</PropertyGroup>
251-
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
252-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
246+
</PropertyGroup>
247+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
248+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
253249
</Project>

‎projecttemplates/WebFormsRelyingParty/WebFormsRelyingParty.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<IISExpressAnonymousAuthentication />
1010
<IISExpressWindowsAuthentication />
1111
<IISExpressUseClassicPipelineMode />
12+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
1213
</PropertyGroup>
1314
<PropertyGroup>
1415
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -48,9 +49,9 @@
4849
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
4950
</PropertyGroup>
5051
<ItemGroup>
51-
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
52+
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
5253
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\lib\log4net.dll</HintPath>
54+
<HintPath>..\..\src\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
5455
</Reference>
5556
<Reference Include="System" />
5657
<Reference Include="System.Data" />
@@ -310,6 +311,9 @@
310311
<Folder Include="App_Data\" />
311312
<Folder Include="bin\" />
312313
</ItemGroup>
314+
<ItemGroup>
315+
<Content Include="packages.config" />
316+
</ItemGroup>
313317
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
314318
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
315319
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
@@ -340,4 +344,5 @@
340344
</VisualStudio>
341345
</ProjectExtensions>
342346
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
347+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
343348
</Project>

‎projecttemplates/WebFormsRelyingParty/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="log4net" version="2.0.0" targetFramework="net45" />
4+
</packages>

‎samples/OAuthAuthorizationServer/OAuthAuthorizationServer.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@
4343
<WarningLevel>4</WarningLevel>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Reference Include="log4net">
47-
<HintPath>..\..\lib\log4net.dll</HintPath>
46+
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\..\src\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
4849
</Reference>
4950
<Reference Include="Microsoft.CSharp" />
5051
<Reference Include="System" />

‎samples/OAuthAuthorizationServer/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="log4net" version="2.0.0" targetFramework="net45" />
34
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
45
</packages>

‎samples/OAuthClient/OAuthClient.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<IISExpressAnonymousAuthentication />
1111
<IISExpressWindowsAuthentication />
1212
<IISExpressUseClassicPipelineMode />
13+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
1314
</PropertyGroup>
1415
<PropertyGroup>
1516
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -49,7 +50,7 @@
4950
</PropertyGroup>
5051
<ItemGroup>
5152
<Reference Include="log4net">
52-
<HintPath>..\..\lib\log4net.dll</HintPath>
53+
<HintPath>..\..\src\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
5354
</Reference>
5455
<Reference Include="System" />
5556
<Reference Include="System.Data" />
@@ -83,6 +84,7 @@
8384
<Content Include="Scripts\jquery-1.6.1.min.js" />
8485
<Content Include="WindowsLive.aspx" />
8586
<Content Include="Yammer.aspx" />
87+
<Content Include="packages.config" />
8688
<None Include="Service References\SampleResourceServer\DataApi.disco" />
8789
<None Include="Service References\SampleResourceServer\configuration91.svcinfo" />
8890
<None Include="Service References\SampleResourceServer\configuration.svcinfo" />
@@ -254,4 +256,5 @@
254256
</VisualStudio>
255257
</ProjectExtensions>
256258
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
259+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
257260
</Project>

‎samples/OAuthClient/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="log4net" version="2.0.0" targetFramework="net45" />
4+
</packages>

‎samples/OAuthConsumer/OAuthConsumer.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<IISExpressAnonymousAuthentication />
1111
<IISExpressWindowsAuthentication />
1212
<IISExpressUseClassicPipelineMode />
13+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\src\</SolutionDir>
1314
</PropertyGroup>
1415
<PropertyGroup>
1516
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -48,8 +49,9 @@
4849
<DefineConstants>$(DefineConstants);SAMPLESONLY</DefineConstants>
4950
</PropertyGroup>
5051
<ItemGroup>
51-
<Reference Include="log4net">
52-
<HintPath>..\..\lib\log4net.dll</HintPath>
52+
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
53+
<SpecificVersion>False</SpecificVersion>
54+
<HintPath>..\..\src\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>
5355
</Reference>
5456
<Reference Include="System" />
5557
<Reference Include="System.Data" />
@@ -77,6 +79,7 @@
7779
<Content Include="images\Sign-in-with-Twitter-darker.png" />
7880
<Content Include="SampleWcf.aspx" />
7981
<Content Include="Yammer.aspx" />
82+
<Content Include="packages.config" />
8083
<None Include="Service References\SampleServiceProvider\DataApi.disco" />
8184
<None Include="Service References\SampleServiceProvider\configuration91.svcinfo" />
8285
<None Include="Service References\SampleServiceProvider\configuration.svcinfo" />
@@ -228,4 +231,5 @@
228231
</VisualStudio>
229232
</ProjectExtensions>
230233
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
234+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
231235
</Project>

0 commit comments

Comments
 (0)