Skip to content
This repository was archived by the owner on Jun 1, 2022. It is now read-only.

Commit d21539b

Browse files
DanielTheCoderDanielTheCoder
committed
Merge branch 'develop'
2 parents c900280 + 4b320d4 commit d21539b

69 files changed

Lines changed: 1691 additions & 0 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,7 @@ $RECYCLE.BIN/
152152

153153
# Mac desktop service store files
154154
.DS_Store
155+
src/MSBTest/Framework.Nuget/tools/*
156+
src/**/*.nupkg
157+
src/*.nupkg
158+
src/MSBTest/Framework.Nuget/*.nupkg

‎Releases/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.nupkg
2+
*.website

‎changelog.txt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
0.0.12 -pre 2013/08/22
2+
Fixed issues:
3+
+ pack: invalid arguments. -> Escaped command
4+
5+
Changes:
6+
+ Change to MSBuild.MSBuildConventions nuget package as default convention
7+
+ powershell Script and import labels are now obsolete and have to be cleaned manually
8+
9+
10+
1.0.0 - 2013/08/18 (Initial publish )
11+
Fixed issues:
12+
New Features:
13+
Changes:

‎src/.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>

‎src/.nuget/NuGet.exe‎

760 KB
Binary file not shown.

‎src/.nuget/NuGet.targets‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
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+
<NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
52+
53+
<!-- Commands -->
54+
<RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir "$(SolutionDir) " </RestoreCommand>
55+
<BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties Configuration=$(Configuration) $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
56+
57+
<!-- We need to ensure packages are restored prior to assembly resolve -->
58+
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
59+
RestorePackages;
60+
$(BuildDependsOn);
61+
</BuildDependsOn>
62+
63+
<!-- Make the build depend on restore packages -->
64+
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
65+
$(BuildDependsOn);
66+
BuildPackage;
67+
</BuildDependsOn>
68+
</PropertyGroup>
69+
70+
<Target Name="CheckPrerequisites">
71+
<!-- Raise an error if we're unable to locate nuget.exe -->
72+
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
73+
<!--
74+
Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
75+
This effectively acts as a lock that makes sure that the download operation will only happen once and all
76+
parallel builds will have to wait for it to complete.
77+
-->
78+
<MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
79+
</Target>
80+
81+
<Target Name="_DownloadNuGet">
82+
<DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
83+
</Target>
84+
85+
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
86+
<Exec Command="$(RestoreCommand)"
87+
Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
88+
89+
<Exec Command="$(RestoreCommand)"
90+
LogStandardErrorAsError="true"
91+
Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
92+
</Target>
93+
94+
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
95+
<Exec Command="$(BuildCommand)"
96+
Condition=" '$(OS)' != 'Windows_NT' " />
97+
98+
<Exec Command="$(BuildCommand)"
99+
LogStandardErrorAsError="true"
100+
Condition=" '$(OS)' == 'Windows_NT' " />
101+
</Target>
102+
103+
<UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
104+
<ParameterGroup>
105+
<OutputFilename ParameterType="System.String" Required="true" />
106+
</ParameterGroup>
107+
<Task>
108+
<Reference Include="System.Core" />
109+
<Using Namespace="System" />
110+
<Using Namespace="System.IO" />
111+
<Using Namespace="System.Net" />
112+
<Using Namespace="Microsoft.Build.Framework" />
113+
<Using Namespace="Microsoft.Build.Utilities" />
114+
<Code Type="Fragment" Language="cs">
115+
<![CDATA[
116+
try {
117+
OutputFilename = Path.GetFullPath(OutputFilename);
118+
119+
Log.LogMessage("Downloading latest version of NuGet.exe...");
120+
WebClient webClient = new WebClient();
121+
webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
122+
123+
return true;
124+
}
125+
catch (Exception ex) {
126+
Log.LogErrorFromException(ex);
127+
return false;
128+
}
129+
]]>
130+
</Code>
131+
</Task>
132+
</UsingTask>
133+
</Project>

‎src/Framework.Nuget/.build/build.props‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
2+
3+
<PropertyGroup>
4+
<PublishToLocalNugetFeed>true</PublishToLocalNugetFeed>
5+
6+
<NugkgPublishReleaseFolder Condition="'$(NugkgPublishReleaseFolder)'==''">$(MSBuildProjectDirectory)\..\..\Releases\</NugkgPublishReleaseFolder>
7+
<NugkgPublishLocalNugetFeedFolder Condition="'$(NugkgPublishLocalNugetFeedFolder)'==''">C:\Dev\_galleries\nuget\</NugkgPublishLocalNugetFeedFolder>
8+
</PropertyGroup>
9+
10+
<ItemGroup Label="Framework">
11+
<additionalFiles Include="$(MSBuildProjectDirectory)\..\Framework\testFramework\**\*.*">
12+
<targetFolder>Framework/tools/testFramework</targetFolder>
13+
</additionalFiles>
14+
15+
<additionalFiles Include="$(MSBuildProjectDirectory)\..\Framework\build\MSBuild.MSBTest.targets">
16+
<targetFolder>Framework/build</targetFolder>
17+
</additionalFiles>
18+
19+
<additionalFiles Include="$(MSBuildProjectDirectory)\..\Framework\build\MSBTest.props">
20+
<targetFolder>Framework/content/.build</targetFolder>
21+
</additionalFiles>
22+
23+
</ItemGroup>
24+
25+
26+
27+
<ItemGroup Label="Framework.sample">
28+
<!-- samples, templates, extensions, src -->
29+
<additionalFiles Include="$(MSBuildProjectDirectory)\..\Framework\extensions\**\*.*">
30+
<targetFolder>Framework.samples/content/extensions</targetFolder>
31+
</additionalFiles>
32+
<additionalFiles Include="$(MSBuildProjectDirectory)\..\Framework\src\**\*.*">
33+
<targetFolder>Framework.samples/content/src</targetFolder>
34+
</additionalFiles>
35+
<additionalFiles Include="$(MSBuildProjectDirectory)\..\Framework\tests\**\*.*">
36+
<targetFolder>Framework.samples/content/tests</targetFolder>
37+
</additionalFiles>
38+
</ItemGroup>
39+
40+
</Project>

‎src/Framework.Nuget/.build/build.targets‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
2+
3+
<PropertyGroup>
4+
<BuildTargets>$(BuildDependsOn);</BuildTargets>
5+
<CleanTargets/>
6+
<RebuildTargets/>
7+
<PublishTargets/>
8+
</PropertyGroup>
9+
10+
<Target Name="Build">
11+
<CallTarget Targets="$(BuildTargets)" />
12+
</Target>
13+
14+
<Target Name="Clean">
15+
<CallTarget Targets="$(CleanTargets)" />
16+
</Target>
17+
18+
<Target Name="Rebuild">
19+
<CallTarget Targets="$(RebuildTargets)" />
20+
</Target>
21+
22+
<Target Name="Publish">
23+
<CallTarget Targets="$(PublishTargets)"/>
24+
</Target>
25+
26+
</Project>

‎src/Framework.Nuget/Framework.Nuget.csproj‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<SchemaVersion>2.0</SchemaVersion>
7+
<ProjectGuid>{55DBF5FA-4338-41D5-A965-026EE3348E1C}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Framework.Nuget</RootNamespace>
11+
<AssemblyName>Framework.Nuget</AssemblyName>
12+
<FileAlignment>512</FileAlignment>
13+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
14+
<RestorePackages>true</RestorePackages>
15+
</PropertyGroup>
16+
<ItemGroup>
17+
<None Include=".build\build.props">
18+
<SubType>Designer</SubType>
19+
</None>
20+
<Compile Include=".build\build.targets" />
21+
<None Include="Framework.samples\Framework.samples.nuspec" />
22+
<None Include="packages.config" />
23+
</ItemGroup>
24+
<ItemGroup>
25+
<None Include="Framework\Framework.nuspec" />
26+
</ItemGroup>
27+
<ItemGroup>
28+
<Folder Include="Framework\tools\" />
29+
</ItemGroup>
30+
<ItemGroup>
31+
<Content Include="Framework.samples\content\MSBTest.readme.samples.txt" />
32+
<Content Include="Framework\content\readme\MSBTest.readme.txt" />
33+
</ItemGroup>
34+
<Import Project="$(MSBuildProjectDirectory)\.build\build.props" />
35+
<Import Project="$(MSBuildProjectDirectory)\.build\build.targets" />
36+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
37+
<Import Project="..\packages\MSBuild.MSBNuget.1.0.3-pre\build\MSBuild.MSBNuget.targets" Condition="Exists('..\packages\MSBuild.MSBNuget.1.0.3-pre\build\MSBuild.MSBNuget.targets')" />
38+
</Project>

‎src/Framework.Nuget/Framework.samples/Framework.samples.nuspec‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>MSBuild.MSBTest.Samples</id>
5+
<version>0.0.12-pre</version>
6+
<title>MSBuild Test Framework Samples structure</title>
7+
<authors>Daniel Sack</authors>
8+
<owners>Daniel Sack</owners>
9+
<!--<licenseUrl>http://LICENSE_URL_HERE_OR_DELETE_THIS_LINE</licenseUrl>
10+
<projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl>
11+
<iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>-->
12+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<description>Generates folder layout with samples for MSBTest.</description>
14+
<releaseNotes>Initial version</releaseNotes>
15+
<copyright>Copyright 2013</copyright>
16+
<tags>MSBuild Test MSBTest</tags>
17+
<dependencies>
18+
<dependency id="MSBuild.MSBTest" />
19+
</dependencies>
20+
</metadata>
21+
22+
</package>

0 commit comments

Comments
 (0)