Skip to content

Commit

Permalink
Merge pull request #16 from cake-contrib/modernize
Browse files Browse the repository at this point in the history
Modernize dependencies and structure
  • Loading branch information
Redth authored Jan 27, 2020
2 parents 603ed20 + 86433f9 commit f787006
Show file tree
Hide file tree
Showing 50 changed files with 2,869 additions and 1,090 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,7 @@ _Pvt_Extensions
.fake/

# Tools
tools/
tools/*
!tools/packages.config

BuildArtifacts/
95 changes: 95 additions & 0 deletions DeviceTests/DeviceTests.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29709.97
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.NUnit", "Test.NUnit\Test.NUnit.csproj", "{168F3AE1-A30C-4419-9C0F-875FB0B8B789}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.xUnit", "Test.xUnit\Test.xUnit.csproj", "{581DE2E5-EB09-490C-B887-BF3AF158FCB1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|iPhone = Debug|iPhone
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Release|Any CPU = Release|Any CPU
Release|iPhone = Release|iPhone
Release|iPhoneSimulator = Release|iPhoneSimulator
UnitTesting|Any CPU = UnitTesting|Any CPU
UnitTesting|iPhone = UnitTesting|iPhone
UnitTesting|iPhoneSimulator = UnitTesting|iPhoneSimulator
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Debug|Any CPU.Build.0 = Debug|Any CPU
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Debug|iPhone.ActiveCfg = Debug|iPhone
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Debug|iPhone.Build.0 = Debug|iPhone
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Release|Any CPU.ActiveCfg = Release|Any CPU
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Release|Any CPU.Build.0 = Release|Any CPU
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Release|iPhone.ActiveCfg = Release|iPhone
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Release|iPhone.Build.0 = Release|iPhone
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.UnitTesting|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.UnitTesting|Any CPU.Build.0 = Debug|iPhoneSimulator
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.UnitTesting|iPhone.ActiveCfg = UnitTesting|iPhone
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.UnitTesting|iPhone.Build.0 = UnitTesting|iPhone
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.UnitTesting|iPhoneSimulator.ActiveCfg = UnitTesting|iPhoneSimulator
{168F3AE1-A30C-4419-9C0F-875FB0B8B789}.UnitTesting|iPhoneSimulator.Build.0 = UnitTesting|iPhoneSimulator
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Debug|iPhone.ActiveCfg = Debug|iPhone
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Debug|iPhone.Build.0 = Debug|iPhone
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Release|Any CPU.Build.0 = Release|Any CPU
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Release|iPhone.ActiveCfg = Release|iPhone
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Release|iPhone.Build.0 = Release|iPhone
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.UnitTesting|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.UnitTesting|Any CPU.Build.0 = Debug|iPhoneSimulator
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.UnitTesting|iPhone.ActiveCfg = UnitTesting|iPhone
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.UnitTesting|iPhone.Build.0 = UnitTesting|iPhone
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.UnitTesting|iPhoneSimulator.ActiveCfg = UnitTesting|iPhoneSimulator
{581DE2E5-EB09-490C-B887-BF3AF158FCB1}.UnitTesting|iPhoneSimulator.Build.0 = UnitTesting|iPhoneSimulator
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {74E91CD5-FCCC-4942-A035-7BB7E05A2E42}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0
$0.TextStylePolicy = $1
$1.FileWidth = 120
$1.inheritsSet = VisualStudio
$1.inheritsScope = text/plain
$1.scope = text/x-csharp
$0.CSharpFormattingPolicy = $2
$2.IndentSwitchSection = True
$2.NewLinesForBracesInProperties = True
$2.NewLinesForBracesInAccessors = True
$2.NewLinesForBracesInAnonymousMethods = True
$2.NewLinesForBracesInControlBlocks = True
$2.NewLinesForBracesInAnonymousTypes = True
$2.NewLinesForBracesInObjectCollectionArrayInitializers = True
$2.NewLinesForBracesInLambdaExpressionBody = True
$2.NewLineForElse = True
$2.NewLineForCatch = True
$2.NewLineForFinally = True
$2.NewLineForMembersInObjectInit = True
$2.NewLineForMembersInAnonymousTypes = True
$2.NewLineForClausesInQuery = True
$2.SpacingAfterMethodDeclarationName = False
$2.SpaceAfterMethodCallName = False
$2.SpaceBeforeOpenSquareBracket = False
$2.inheritsSet = Mono
$2.inheritsScope = text/x-csharp
$2.scope = text/x-csharp
EndGlobalSection
EndGlobal
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -9,6 +9,8 @@
<RootNamespace>Test.xUnit</RootNamespace>
<AssemblyName>Test.xUnit</AssemblyName>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -34,7 +36,8 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\iPhone\Release</OutputPath>
<DefineConstants></DefineConstants>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodesignKey>iPhone Developer</CodesignKey>
Expand All @@ -51,7 +54,8 @@
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\iPhoneSimulator\Release</OutputPath>
<DefineConstants></DefineConstants>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodesignKey>iPhone Developer</CodesignKey>
Expand Down Expand Up @@ -86,54 +90,32 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'UnitTesting|AnyCPU' ">
<Optimize>false</Optimize>
<OutputPath>bin\UnitTesting</OutputPath>
<DefineConstants></DefineConstants>
<DefineConstants>
</DefineConstants>
<WarningLevel>4</WarningLevel>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchUseSGen>true</MtouchUseSGen>
<MtouchUseRefCounting>true</MtouchUseRefCounting>
<MtouchLink></MtouchLink>
<MtouchHttpClientHandler></MtouchHttpClientHandler>
<MtouchTlsProvider></MtouchTlsProvider>
<MtouchLink>
</MtouchLink>
<MtouchHttpClientHandler>
</MtouchHttpClientHandler>
<MtouchTlsProvider>
</MtouchTlsProvider>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<Reference Include="xunit.abstractions">
<HintPath>..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert">
<HintPath>..\packages\xunit.assert.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core">
<HintPath>..\packages\xunit.extensibility.core.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.core.dll</HintPath>
</Reference>
<Reference Include="xunit.execution.dotnet">
<HintPath>..\packages\xunit.extensibility.execution.2.2.0-beta4-build3444\lib\netstandard1.0\xunit.execution.dotnet.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.2.3.0.49\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="xunit.runner.utility.dotnet">
<HintPath>..\packages\xunit.runner.utility.2.2.0-beta2-build3300\lib\netstandard1.1\xunit.runner.utility.dotnet.dll</HintPath>
</Reference>
<Reference Include="xunit.runner.devices">
<HintPath>..\packages\xunit.runner.devices.2.1.0\lib\Xamarin.iOS\xunit.runner.devices.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
<ImageAsset Include="Assets.xcassets\Contents.json" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\Contents.json">
<Visible>false</Visible>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
Expand All @@ -145,7 +127,6 @@
<ItemGroup>
<None Include="Info.plist" />
<None Include="Entitlements.plist" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
Expand All @@ -155,7 +136,16 @@
<DependentUpon>ViewController.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="xunit">
<Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="xunit.runner.devices">
<Version>2.4.1</Version>
</PackageReference>
<PackageReference Include="xunit.runner.utility">
<Version>2.4.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.2.3.0.49\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.0.49\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
<Import Project="..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" />
</Project>
File renamed without changes.
File renamed without changes.
67 changes: 48 additions & 19 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,50 @@
version: 1.0.{build}
environment:
GITHUB_USERNAME:
secure: 0Q9MvUId56SizmZwCf0cgg==
GITHUB_TOKEN:
secure: egpO9sZJN4KlnyHlFMSMu1NAeWZ/3diyUXLQMLF5HlnVb/6mXG8Lejm+Ib+4bCF7
NUGET_APIKEY:
secure: YP/3KxC2ffsuHNaolPXj66JVGzSjON9FcR2S2OEzn9c6SV14oPzUh1ySyeT+G+aA
NUGET_SOURCE: https://www.myget.org/F/ghuntley/api/v2
xamarin:
email: [email protected]
password:
secure: 9PLfbvP3ON+Xk17Yd4rJag==
android: true
ios: true
#---------------------------------#
# Build Image #
#---------------------------------#
image: Visual Studio 2019

#---------------------------------#
# Build Script #
#---------------------------------#
build_script:
- cmd: ./build.cmd
- ps: .\build.ps1 -Target AppVeyor

#---------------------------------#
# Tests
#---------------------------------#
test: off
artifacts:
- path: '**/bin/*'
- path: artifacts/*

#---------------------------------#
# Pull Requests #
#---------------------------------#
pull_requests:
do_not_increment_build_number: true

#---------------------------------#
# General #
#---------------------------------#
skip_branch_with_pr: true

#---------------------------------#
# Branches to build #
#---------------------------------#
branches:
# Whitelist
only:
- develop
- master
- /release/.*/
- /hotfix/.*/

#---------------------------------#
# Build Cache #
#---------------------------------#
cache:
- tools -> recipe.cake, tools/packages.config

#---------------------------------#
# Skip builds for doc changes #
#---------------------------------#
skip_commits:
# Regex for matching commit message
message: /(doc).*/
50 changes: 0 additions & 50 deletions bootstrap.ps1

This file was deleted.

Loading

0 comments on commit f787006

Please sign in to comment.