Skip to content

Commit b7f2114

Browse files
gep13gep13
committed
Merge branch 'release/0.7.0'
* release/0.7.0: (GH-35) Added support for latest Cake
2 parents 5e92a27 + 06d43bc commit b7f2114

File tree

9 files changed

+175
-258
lines changed

9 files changed

+175
-258
lines changed

‎.appveyor.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#---------------------------------#
2+
# Build Image #
3+
#---------------------------------#
4+
image: Visual Studio 2017
5+
16
#---------------------------------#
27
# Build Script #
38
#---------------------------------#
@@ -23,4 +28,4 @@ branches:
2328
#---------------------------------#
2429
cache:
2530
- Source\packages -> Source\**\packages.config
26-
- tools -> setup.cake
31+
- tools -> setup.cake

‎Source/Cake.Tfx.Tests/Cake.Tfx.Tests.csproj

Lines changed: 17 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,23 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{D0C3F809-3FE7-4F67-9B2B-DF4EFCB1BFCE}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Cake.Tfx.Tests</RootNamespace>
11-
<AssemblyName>Cake.Tfx.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>
15-
</NuGetPackageImportStamp>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
165
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
<CodeAnalysisRuleSet />
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
<CodeAnalysisRuleSet />
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="Cake.Core, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Cake.Core.0.17.0\lib\net45\Cake.Core.dll</HintPath>
39-
<Private>True</Private>
40-
</Reference>
41-
<Reference Include="Cake.Testing, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Cake.Testing.0.17.1\lib\net45\Cake.Testing.dll</HintPath>
43-
<Private>True</Private>
44-
</Reference>
45-
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
46-
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
47-
<Private>True</Private>
48-
</Reference>
49-
<Reference Include="System" />
50-
<Reference Include="System.Core" />
51-
<Reference Include="System.Xml.Linq" />
52-
<Reference Include="System.Data.DataSetExtensions" />
53-
<Reference Include="Microsoft.CSharp" />
54-
<Reference Include="System.Data" />
55-
<Reference Include="System.Net.Http" />
56-
<Reference Include="System.Xml" />
57-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
58-
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
62-
<HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
63-
<Private>True</Private>
64-
</Reference>
65-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
66-
<HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
67-
<Private>True</Private>
68-
</Reference>
69-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
70-
<HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
73-
</ItemGroup>
74-
<ItemGroup>
75-
<Compile Include="Fixtures\TfxExtensionCreateRunnerFixture.cs" />
76-
<Compile Include="Fixtures\TfxExtensionInstallRunnerFixture.cs" />
77-
<Compile Include="Fixtures\TfxExtensionPublishRunnerFixture.cs" />
78-
<Compile Include="Fixtures\TfxExtensionShareRunnerFixture.cs" />
79-
<Compile Include="Properties\AssemblyInfo.cs" />
80-
<Compile Include="TfxExtensionCreateRunnerTests.cs" />
81-
<Compile Include="TfxExtensionInstallRunnerTests.cs" />
82-
<Compile Include="TfxExtensionPublishRunnerTests.cs" />
83-
<Compile Include="TfxExtensionShareRunnerTests.cs" />
84-
<Compile Include="TfxFixture.cs" />
85-
</ItemGroup>
6+
867
<ItemGroup>
87-
<None Include="packages.config" />
8+
<PackageReference Include="Cake.Core" Version="0.26.0">
9+
<PrivateAssets>all</PrivateAssets>
10+
</PackageReference>
11+
<PackageReference Include="Cake.Testing" Version="0.26.0">
12+
<PrivateAssets>all</PrivateAssets>
13+
</PackageReference>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
15+
<PackageReference Include="xunit" Version="2.3.1" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
8817
</ItemGroup>
18+
8919
<ItemGroup>
90-
<ProjectReference Include="..\Cake.Tfx\Cake.Tfx.csproj">
91-
<Project>{8a2ef454-d0b6-4de6-8961-2b806c2f882f}</Project>
92-
<Name>Cake.Tfx</Name>
93-
</ProjectReference>
20+
<ProjectReference Include="..\Cake.Tfx\Cake.Tfx.csproj" />
9421
</ItemGroup>
95-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
96-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
97-
Other similar extension points exist, see Microsoft.Common.targets.
98-
<Target Name="BeforeBuild">
99-
</Target>
100-
<Target Name="AfterBuild">
101-
</Target>
102-
-->
103-
</Project>
22+
23+
</Project>

‎Source/Cake.Tfx.Tests/Properties/AssemblyInfo.cs

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

‎Source/Cake.Tfx/Cake.Tfx.csproj

Lines changed: 23 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8A2EF454-D0B6-4DE6-8961-2B806C2F882F}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Cake.Tfx</RootNamespace>
11-
<AssemblyName>Cake.Tfx</AssemblyName>
12-
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>
15-
</NuGetPackageImportStamp>
3+
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworkProfile />
165
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
6+
<PropertyGroup>
257
<CodeAnalysisRuleSet>Cake.Tfx.ruleset</CodeAnalysisRuleSet>
26-
<DocumentationFile>bin\Debug\Cake.Tfx.XML</DocumentationFile>
278
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<ErrorReport>prompt</ErrorReport>
34-
<WarningLevel>4</WarningLevel>
35-
<CodeAnalysisRuleSet>Cake.Tfx.ruleset</CodeAnalysisRuleSet>
36-
<DocumentationFile>bin\Release\Cake.Tfx.XML</DocumentationFile>
9+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
10+
<DefineConstants>TRACE;DEBUG;net46;</DefineConstants>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
13+
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
3714
</PropertyGroup>
15+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
16+
<DocumentationFile>bin\Debug\net46\Cake.Tfx.xml</DocumentationFile>
17+
</PropertyGroup>
18+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net46|AnyCPU'">
19+
<DocumentationFile>bin\Release\net46\Cake.Tfx.xml</DocumentationFile>
20+
</PropertyGroup>
21+
3822
<ItemGroup>
39-
<Reference Include="Cake.Common, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Cake.Common.0.17.0\lib\net45\Cake.Common.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="Cake.Core, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Cake.Core.0.17.0\lib\net45\Cake.Core.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
47-
<Reference Include="System" />
48-
<Reference Include="System.Core" />
49-
<Reference Include="System.Xml.Linq" />
50-
<Reference Include="System.Data.DataSetExtensions" />
23+
<PackageReference Include="Cake.Core" Version="0.26.0" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
5127
<Reference Include="Microsoft.CSharp" />
52-
<Reference Include="System.Data" />
28+
<Reference Include="System.Net" />
5329
<Reference Include="System.Net.Http" />
54-
<Reference Include="System.Xml" />
55-
</ItemGroup>
56-
<ItemGroup>
57-
<Compile Include="..\SolutionInfo.cs">
58-
<Link>Properties\SolutionInfo.cs</Link>
59-
</Compile>
60-
<Compile Include="Extension\Create\TfxExtensionCreateArgumentBuilder.cs" />
61-
<Compile Include="Extension\Create\TfxExtensionCreateRunner.cs" />
62-
<Compile Include="Extension\Create\TfxExtensionCreateSettings.cs" />
63-
<Compile Include="Extension\ICreatePublishSettings.cs" />
64-
<Compile Include="Extension\Install\TfxExtensionInstallArgumentBuilder.cs" />
65-
<Compile Include="Extension\Install\TfxExtensionInstallRunner.cs" />
66-
<Compile Include="Extension\Install\TfxExtensionInstallSettings.cs" />
67-
<Compile Include="Extension\Publish\TfxExtensionPublishArgumentBuilder.cs" />
68-
<Compile Include="Extension\Publish\TfxExtensionPublishRunner.cs" />
69-
<Compile Include="Extension\Publish\TfxExtensionPublishSettings.cs" />
70-
<Compile Include="Extension\Share\TfxExtensionShareArgumentBuilder.cs" />
71-
<Compile Include="Extension\Share\TfxExtensionShareRunner.cs" />
72-
<Compile Include="Extension\Share\TfxExtensionShareSettings.cs" />
73-
<Compile Include="ITfxArgumentBuilder.cs" />
74-
<Compile Include="Properties\AssemblyInfo.cs" />
75-
<Compile Include="TfxAliases.cs" />
76-
<Compile Include="TfxArgumentBuilder.cs" />
77-
<Compile Include="TfxAuthType.cs" />
78-
<Compile Include="TfxServerSettings.cs" />
79-
<Compile Include="TfxSettings.cs" />
80-
<Compile Include="TfxOutputType.cs" />
81-
<Compile Include="TfxTool.cs" />
82-
</ItemGroup>
83-
<ItemGroup>
84-
<None Include="Cake.Tfx.ruleset" />
85-
<None Include="packages.config" />
86-
<None Include="tfx.cake">
87-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
88-
</None>
89-
</ItemGroup>
90-
<ItemGroup>
91-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\Newtonsoft.Json.dll" />
92-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />
93-
<Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
30+
<Reference Include="System.Net.Http.WebRequest" />
9431
</ItemGroup>
95-
<ItemGroup />
96-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
97-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
98-
Other similar extension points exist, see Microsoft.Common.targets.
99-
<Target Name="BeforeBuild">
100-
</Target>
101-
<Target Name="AfterBuild">
102-
</Target>
103-
-->
104-
</Project>
32+
</Project>

‎Source/Cake.Tfx/Properties/AssemblyInfo.cs

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

0 commit comments

Comments
 (0)