diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-09-02 21:38:12 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-09-02 21:38:12 -0700 |
| commit | fc20c2d5abe1f626368b309977de0c2b4a440c70 (patch) | |
| tree | bc9b61e0f7728b9e3764b56f02769eb94115f705 | |
| parent | 3bca01ae8f1230a53c4e73cfdeba2a75e8f37f45 (diff) | |
| download | DotNetOpenAuth-fc20c2d5abe1f626368b309977de0c2b4a440c70.zip DotNetOpenAuth-fc20c2d5abe1f626368b309977de0c2b4a440c70.tar.gz DotNetOpenAuth-fc20c2d5abe1f626368b309977de0c2b4a440c70.tar.bz2 | |
Fixed a couple of build breaks exposed by drop.proj.
| -rw-r--r-- | samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj | 7 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.automated.targets | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj index 7bff67b..e896923 100644 --- a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj +++ b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj @@ -238,7 +238,12 @@ </ItemGroup> <Target Name="BuildUnified" DependsOnTargets="Build" Inputs="@(ILMergeProjectInputAssemblies)" Outputs="$(ILMergeProjectOutputAssembly)"> <MakeDir Directories="$(ILMergeOutputAssemblyDirectory)" /> - <ILMerge ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt" InputAssemblies="@(ILMergeProjectInputAssemblies)" OutputFile="$(ILMergeProjectOutputAssembly)" KeyFile="$(PublicKeyFile)" DelaySign="true" /> + <ILMerge ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt" + InputAssemblies="@(ILMergeProjectInputAssemblies)" + OutputFile="$(ILMergeProjectOutputAssembly)" + ToolPath="$(ProjectRoot)tools\ILMerge" + KeyFile="$(PublicKeyFile)" + DelaySign="true" /> </Target> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " /> diff --git a/tools/DotNetOpenAuth.automated.targets b/tools/DotNetOpenAuth.automated.targets index 5333b34..034fa23 100644 --- a/tools/DotNetOpenAuth.automated.targets +++ b/tools/DotNetOpenAuth.automated.targets @@ -34,12 +34,12 @@ <Target Name="BuildProduct" DependsOnTargets="SkipVerification"> <MSBuild BuildInParallel="$(BuildInParallel)" - Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).csproj" /> + Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).proj" /> </Target> <Target Name="BuildUnifiedProduct" DependsOnTargets="BuildProduct"> <MSBuild BuildInParallel="$(BuildInParallel)" - Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).csproj" + Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).proj" Targets="BuildUnifiedProduct" /> </Target> </Project> |