Skip to content

Commit f170b3d

Browse files
author
Kristoffer Ahl
committed
Merge branch 'release-2.0-beta1'
2 parents 363f7e5 + 167a929 commit f170b3d

File tree

237 files changed

+1752
-62326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+1752
-62326
lines changed

‎.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#Project files
2+
/Build/Artifacts
23
/Build/Reports
34
/Build/Output
45
/Build/CodeCoverage
56
/Build/FluentSecurity.TestHelper.nuspec
67
/Build/FluentSecurity.nuspec
7-
8-
CommonAssemblyInfo.cs
8+
/Packages/*
9+
!/Packages/repositories.config
10+
SharedAssemblyInfo.cs
911

1012
#OS junk files
1113
[Tt]humbs.db

‎.nuget/NuGet.Config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
</configuration>

‎.nuget/NuGet.exe

636 KB
Binary file not shown.

‎.nuget/NuGet.targets

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5+
6+
<!-- Enable the restore command to run before builds -->
7+
<RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
8+
9+
<!-- Property that enables building a package from a project -->
10+
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
11+
12+
<!-- Determines if package restore consent is required to restore packages -->
13+
<RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
14+
15+
<!-- Download NuGet.exe if it does not already exist -->
16+
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
17+
</PropertyGroup>
18+
19+
<ItemGroup Condition=" '$(PackageSources)' == '' ">
20+
<!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
21+
<!-- 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 -->
22+
<!--
23+
<PackageSource Include="https://nuget.org/api/v2/" />
24+
<PackageSource Include="https://my-nuget-source/nuget/" />
25+
-->
26+
</ItemGroup>
27+
28+
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
29+
<!-- Windows specific commands -->
30+
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
31+
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
32+
</PropertyGroup>
33+
34+
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
35+
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
36+
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
37+
<PackagesConfig>packages.config</PackagesConfig>
38+
</PropertyGroup>
39+
40+
<PropertyGroup>
41+
<!-- NuGet command -->
42+
<NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
43+
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
44+
45+
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
46+
<NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
47+
48+
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
49+
50+
<RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
51+
<!-- Commands -->
52+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
53+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
54+
55+
<!-- We need to ensure packages are restored prior to assembly resolve -->
56+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
57+
RestorePackages;
58+
$(BuildDependsOn);
59+
</BuildDependsOn>
60+
61+
<!-- Make the build depend on restore packages -->
62+
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
63+
$(BuildDependsOn);
64+
BuildPackage;
65+
</BuildDependsOn>
66+
</PropertyGroup>
67+
68+
<Target Name="CheckPrerequisites">
69+
<!-- Raise an error if we're unable to locate nuget.exe -->
70+
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
71+
<SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
72+
<!--
73+
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
74+
This effectively acts as a lock that makes sure that the download operation will only happen once and all
75+
parallel builds will have to wait for it to complete.
76+
-->
77+
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
78+
</Target>
79+
80+
<Target Name="_DownloadNuGet">
81+
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
82+
</Target>
83+
84+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
85+
<Exec Command="$(RestoreCommand)"
86+
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
87+
88+
<Exec Command="$(RestoreCommand)"
89+
LogStandardErrorAsError="true"
90+
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
91+
</Target>
92+
93+
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
94+
<Exec Command="$(BuildCommand)"
95+
Condition=" '$(OS)' != 'Windows_NT' " />
96+
97+
<Exec Command="$(BuildCommand)"
98+
LogStandardErrorAsError="true"
99+
Condition=" '$(OS)' == 'Windows_NT' " />
100+
</Target>
101+
102+
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
103+
<ParameterGroup>
104+
<OutputFilename ParameterType="System.String" Required="true" />
105+
</ParameterGroup>
106+
<Task>
107+
<Reference Include="System.Core" />
108+
<Using Namespace="System" />
109+
<Using Namespace="System.IO" />
110+
<Using Namespace="System.Net" />
111+
<Using Namespace="Microsoft.Build.Framework" />
112+
<Using Namespace="Microsoft.Build.Utilities" />
113+
<Code Type="Fragment" Language="cs">
114+
<![CDATA[
115+
try {
116+
OutputFilename = Path.GetFullPath(OutputFilename);
117+
118+
Log.LogMessage("Downloading latest version of NuGet.exe...");
119+
WebClient webClient = new WebClient();
120+
webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
121+
122+
return true;
123+
}
124+
catch (Exception ex) {
125+
Log.LogErrorFromException(ex);
126+
return false;
127+
}
128+
]]>
129+
</Code>
130+
</Task>
131+
</UsingTask>
132+
133+
<UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
134+
<ParameterGroup>
135+
<EnvKey ParameterType="System.String" Required="true" />
136+
<EnvValue ParameterType="System.String" Required="true" />
137+
</ParameterGroup>
138+
<Task>
139+
<Using Namespace="System" />
140+
<Code Type="Fragment" Language="cs">
141+
<![CDATA[
142+
try {
143+
Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
144+
}
145+
catch {
146+
}
147+
]]>
148+
</Code>
149+
</Task>
150+
</UsingTask>
151+
</Project>

‎.nuget/packages.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Koshu" version="0.5.1" />
4+
<package id="NUnit.Runners" version="2.6.2" />
5+
</packages>

‎Build.bat

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Build/NuGet/FluentSecurity.TestHelper.nuspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
</dependencies>
1717
</metadata>
1818
<files>
19-
<file src="Artifacts\FluentSecurity\FluentSecurity.TestHelper.dll" target="lib\net40" />
20-
<file src="Artifacts\FluentSecurity\**\*.txt" />
19+
<file src="@ARTIFACT-PATH@\FluentSecurity.TestHelper.dll" target="lib\net40" />
20+
<file src="@ARTIFACT-PATH@\**\*.txt" />
21+
<file src="@ARTIFACT-PATH@\**\*.md" />
2122
</files>
2223
</package>

‎Build/NuGet/FluentSecurity.nuspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<tags>asp.net mvc .net40 security</tags>
1414
</metadata>
1515
<files>
16-
<file src="Artifacts\FluentSecurity\FluentSecurity.dll" target="lib\net40" />
17-
<file src="Artifacts\FluentSecurity\**\*.txt" />
16+
<file src="@ARTIFACT-PATH@\FluentSecurity.dll" target="lib\net40" />
17+
<file src="@ARTIFACT-PATH@\**\*.txt" />
18+
<file src="@ARTIFACT-PATH@\**\*.md" />
1819
</files>
1920
</package>

0 commit comments

Comments
 (0)