summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--EnlistmentInfo.props5
-rw-r--r--EnlistmentInfo.targets1
-rw-r--r--lib/DotNetOpenAuth.BuildTasks.targets1
-rw-r--r--src/.nuget/NuGet.Config6
-rw-r--r--src/.nuget/NuGet.exebin0 -> 650752 bytes
-rw-r--r--src/.nuget/NuGet.targets153
-rw-r--r--src/packages/Microsoft.IdentityModel.6.1.7600.16394/Microsoft.IdentityModel.6.1.7600.16394.nupkgbin504954 -> 0 bytes
-rw-r--r--src/packages/Microsoft.IdentityModel.6.1.7600.16394/Microsoft.IdentityModel.6.1.7600.16394.nuspec18
-rw-r--r--src/packages/Microsoft.IdentityModel.6.1.7600.16394/lib/net35/Microsoft.IdentityModel.dllbin1103256 -> 0 bytes
-rw-r--r--src/packages/repositories.config29
-rw-r--r--tools/sandcastle.targets1
11 files changed, 166 insertions, 48 deletions
diff --git a/EnlistmentInfo.props b/EnlistmentInfo.props
index 0c5d62d..5afd8f5 100644
--- a/EnlistmentInfo.props
+++ b/EnlistmentInfo.props
@@ -6,5 +6,10 @@
<StyleCopTreatErrorsAsWarnings Condition=" '$(StyleCopTreatErrorsAsWarnings)' == '' ">true</StyleCopTreatErrorsAsWarnings>
<ProjectRoot>$(MSBuildThisFileDirectory)</ProjectRoot>
+
+ <SolutionDir>$(ProjectRoot)src\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
+ <RequireRestoreConsent>false</RequireRestoreConsent>
+ <DownloadNuGetExe>true</DownloadNuGetExe>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/EnlistmentInfo.targets b/EnlistmentInfo.targets
index 1e79b6d..cf290f7 100644
--- a/EnlistmentInfo.targets
+++ b/EnlistmentInfo.targets
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Import Project="Tools\StyleCop\StyleCop.targets"/>
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
</Project> \ No newline at end of file
diff --git a/lib/DotNetOpenAuth.BuildTasks.targets b/lib/DotNetOpenAuth.BuildTasks.targets
index 9ef88f6..b070bd7 100644
--- a/lib/DotNetOpenAuth.BuildTasks.targets
+++ b/lib/DotNetOpenAuth.BuildTasks.targets
@@ -6,7 +6,6 @@
</ItemGroup>
<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="GetBuildVersion" />
- <UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="SetEnvironmentVariable" />
<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="ChangeProjectReferenceToAssemblyReference" />
<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="CompareFiles" />
<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="ReSignDelaySignedAssemblies" />
diff --git a/src/.nuget/NuGet.Config b/src/.nuget/NuGet.Config
new file mode 100644
index 0000000..67f8ea0
--- /dev/null
+++ b/src/.nuget/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <solution>
+ <add key="disableSourceControlIntegration" value="true" />
+ </solution>
+</configuration> \ No newline at end of file
diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe
new file mode 100644
index 0000000..8d13fd8
--- /dev/null
+++ b/src/.nuget/NuGet.exe
Binary files differ
diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets
new file mode 100644
index 0000000..d3befda
--- /dev/null
+++ b/src/.nuget/NuGet.targets
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+ <!-- Enable the restore command to run before builds -->
+ <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
+
+ <!-- Property that enables building a package from a project -->
+ <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+ <!-- Determines if package restore consent is required to restore packages -->
+ <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+ <!-- Download NuGet.exe if it does not already exist -->
+ <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(PackageSources)' == '' ">
+ <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+ <!-- The official NuGet package source (https://nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+ <!--
+ <PackageSource Include="https://nuget.org/api/v2/" />
+ <PackageSource Include="https://my-nuget-source/nuget/" />
+ -->
+ </ItemGroup>
+
+ <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+ <!-- Windows specific commands -->
+ <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+ <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+ <PackagesDir>$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
+ </PropertyGroup>
+
+ <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+ <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+ <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+ <PackagesConfig>packages.config</PackagesConfig>
+ <PackagesDir>$(SolutionDir)packages</PackagesDir>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <!-- NuGet command -->
+ <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+ <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+ <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+ <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+ <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+ <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+ <!-- Commands -->
+ <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -o "$(PackagesDir)"</RestoreCommand>
+ <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
+
+ <!-- We need to ensure packages are restored prior to assembly resolve -->
+ <ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
+ RestorePackages;
+ $(ResolveReferencesDependsOn);
+ </ResolveReferencesDependsOn>
+
+ <!-- Make the build depend on restore packages -->
+ <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+ $(BuildDependsOn);
+ BuildPackage;
+ </BuildDependsOn>
+ </PropertyGroup>
+
+ <Target Name="CheckPrerequisites">
+ <!-- Raise an error if we're unable to locate nuget.exe -->
+ <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+ <SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
+ <!--
+ Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+ This effectively acts as a lock that makes sure that the download operation will only happen once and all
+ parallel builds will have to wait for it to complete.
+ -->
+ <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
+ </Target>
+
+ <Target Name="_DownloadNuGet">
+ <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+ </Target>
+
+ <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(RestoreCommand)"
+ Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+ <Exec Command="$(RestoreCommand)"
+ LogStandardErrorAsError="true"
+ Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+ </Target>
+
+ <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(BuildCommand)"
+ Condition=" '$(OS)' != 'Windows_NT' " />
+
+ <Exec Command="$(BuildCommand)"
+ LogStandardErrorAsError="true"
+ Condition=" '$(OS)' == 'Windows_NT' " />
+ </Target>
+
+ <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+ <ParameterGroup>
+ <OutputFilename ParameterType="System.String" Required="true" />
+ </ParameterGroup>
+ <Task>
+ <Reference Include="System.Core" />
+ <Using Namespace="System" />
+ <Using Namespace="System.IO" />
+ <Using Namespace="System.Net" />
+ <Using Namespace="Microsoft.Build.Framework" />
+ <Using Namespace="Microsoft.Build.Utilities" />
+ <Code Type="Fragment" Language="cs">
+ <![CDATA[
+ try {
+ OutputFilename = Path.GetFullPath(OutputFilename);
+
+ Log.LogMessage("Downloading latest version of NuGet.exe...");
+ WebClient webClient = new WebClient();
+ webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+
+ return true;
+ }
+ catch (Exception ex) {
+ Log.LogErrorFromException(ex);
+ return false;
+ }
+ ]]>
+ </Code>
+ </Task>
+ </UsingTask>
+
+ <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+ <ParameterGroup>
+ <EnvKey ParameterType="System.String" Required="true" />
+ <EnvValue ParameterType="System.String" Required="true" />
+ </ParameterGroup>
+ <Task>
+ <Using Namespace="System" />
+ <Code Type="Fragment" Language="cs">
+ <![CDATA[
+ try {
+ Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
+ }
+ catch {
+ }
+ ]]>
+ </Code>
+ </Task>
+ </UsingTask>
+</Project> \ No newline at end of file
diff --git a/src/packages/Microsoft.IdentityModel.6.1.7600.16394/Microsoft.IdentityModel.6.1.7600.16394.nupkg b/src/packages/Microsoft.IdentityModel.6.1.7600.16394/Microsoft.IdentityModel.6.1.7600.16394.nupkg
deleted file mode 100644
index acc6f4e..0000000
--- a/src/packages/Microsoft.IdentityModel.6.1.7600.16394/Microsoft.IdentityModel.6.1.7600.16394.nupkg
+++ /dev/null
Binary files differ
diff --git a/src/packages/Microsoft.IdentityModel.6.1.7600.16394/Microsoft.IdentityModel.6.1.7600.16394.nuspec b/src/packages/Microsoft.IdentityModel.6.1.7600.16394/Microsoft.IdentityModel.6.1.7600.16394.nuspec
deleted file mode 100644
index 630c4b6..0000000
--- a/src/packages/Microsoft.IdentityModel.6.1.7600.16394/Microsoft.IdentityModel.6.1.7600.16394.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
- <metadata>
- <id>Microsoft.IdentityModel</id>
- <version>6.1.7600.16394</version>
- <title>Windows Identity Foundation</title>
- <authors>Microsoft</authors>
- <owners>Microsoft</owners>
- <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=259741</licenseUrl>
- <projectUrl>http://www.microsoft.com/wif</projectUrl>
- <requireLicenseAcceptance>true</requireLicenseAcceptance>
- <description>Windows Identity Foundation enables .NET developers to externalize identity logic from their application, improving developer productivity, enhancing application security, and enabling interoperable federation. Enjoy greater productivity, applying the same tools and programming model to build on-premises software as well as cloud services. Create more secure applications by reducing custom implementations and using a single simplified identity model based on claims. Enjoy greater flexibility in application deployment through interoperability based on industry standard protocols, allowing applications and identity infrastructure services to communicate via claims.</description>
- <summary>Windows Identity Foundation enables .NET developers to externalize identity logic from their application, improving developer productivity, enhancing application security, and enabling interoperable federation. Enjoy greater productivity, applying the same tools and programming model to build on-premises software as well as cloud services. Create more secure applications by reducing custom implementations and using a single simplified identity model based on claims. Enjoy greater flexibility in application deployment through interoperability based on industry standard protocols, allowing applications and identity infrastructure services to communicate via claims.</summary>
- <releaseNotes>WIF was integrated into .NET in version 4.5. WIF 3.5 is available for Windows Vista and Windows 7 as a standalone installer, as feature in Windows 8, or WebPI. WIF 3.5 works with .NET 3.5, 4.0 and 4.5. Because many of the classes in WIF 3.5 and WIF 4.5 share the same names, when you are using both WIF 3.5 and WIF 4.5 together, be sure to either use fully qualified class names or use namespace aliases to distinguish between classes in WIF 3.5 and WIF 4.5.</releaseNotes>
- <copyright>Copyright 2012</copyright>
- <tags>authentication federation claims</tags>
- </metadata>
-</package> \ No newline at end of file
diff --git a/src/packages/Microsoft.IdentityModel.6.1.7600.16394/lib/net35/Microsoft.IdentityModel.dll b/src/packages/Microsoft.IdentityModel.6.1.7600.16394/lib/net35/Microsoft.IdentityModel.dll
deleted file mode 100644
index 5c1c205..0000000
--- a/src/packages/Microsoft.IdentityModel.6.1.7600.16394/lib/net35/Microsoft.IdentityModel.dll
+++ /dev/null
Binary files differ
diff --git a/src/packages/repositories.config b/src/packages/repositories.config
deleted file mode 100644
index 0b7a47b..0000000
--- a/src/packages/repositories.config
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<repositories>
- <repository path="..\..\samples\OAuthConsumerWpf\packages.config" />
- <repository path="..\..\samples\OpenIdOfflineProvider\packages.config" />
- <repository path="..\DotNetOpenAuth.AspNet\packages.config" />
- <repository path="..\DotNetOpenAuth.Core.UI\packages.config" />
- <repository path="..\DotNetOpenAuth.Core\packages.config" />
- <repository path="..\DotNetOpenAuth.InfoCard.UI\packages.config" />
- <repository path="..\DotNetOpenAuth.InfoCard\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth.Common\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth.Consumer\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth.ServiceProvider\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth2.AuthorizationServer\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth2.Client.UI\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth2.Client\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth2.ClientAuthorization\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth2.ResourceServer\packages.config" />
- <repository path="..\DotNetOpenAuth.OAuth2\packages.config" />
- <repository path="..\DotNetOpenAuth.OpenId.Provider.UI\packages.config" />
- <repository path="..\DotNetOpenAuth.OpenId.Provider\packages.config" />
- <repository path="..\DotNetOpenAuth.OpenId.RelyingParty.UI\packages.config" />
- <repository path="..\DotNetOpenAuth.OpenId.RelyingParty\packages.config" />
- <repository path="..\DotNetOpenAuth.OpenId.UI\packages.config" />
- <repository path="..\DotNetOpenAuth.OpenId\packages.config" />
- <repository path="..\DotNetOpenAuth.OpenIdInfoCard.UI\packages.config" />
- <repository path="..\DotNetOpenAuth.OpenIdOAuth\packages.config" />
- <repository path="..\DotNetOpenAuth.Test\packages.config" />
-</repositories> \ No newline at end of file
diff --git a/tools/sandcastle.targets b/tools/sandcastle.targets
index 526ea46..6bedf13 100644
--- a/tools/sandcastle.targets
+++ b/tools/sandcastle.targets
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTarget="Build">
+ <UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="SetEnvironmentVariable" />
<PropertyGroup>
<PresentationStyle Condition="'$(PresentationStyle)' == ''">vs2005</PresentationStyle>
<!-- Environment -->
generated by cgit v1.1 at 2025-05-17 14:53:06 +0000