Skip to content

Commit

Permalink
Upgrade to VS 2017 (#7)
Browse files Browse the repository at this point in the history
* Build chocolatey package (without deploying) on develop branch
* Upgrading to VS 2017 new project format
* Switch to ContinuousDelivery
  • Loading branch information
cd21h committed Oct 25, 2017
1 parent df5c30c commit ddf1686
Show file tree
Hide file tree
Showing 15 changed files with 120 additions and 549 deletions.
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
assembly-versioning-scheme: MajorMinorPatch
mode: Mainline
mode: ContinuousDelivery
branches: {}
ignore:
sha: []
49 changes: 32 additions & 17 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
pull_requests:
do_not_increment_build_number: true

os: Visual Studio 2015
os: Visual Studio 2017

nuget:
disable_publish_on_pr: true
Expand All @@ -18,24 +18,34 @@
patch: false

environment:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: true
CHOCOLATEY_KEY:
secure: 9M5HbeG8Cc5XbyirU+F+mVmtVP1tJ9WB8n4s3ATg+doSkUNODnFZ0LAdR44o2Jcd
NUGET_KEY:
secure: yDtlwZxOr+meDM0iMA3pWo3VO+t2oRDIjf+accbVz3N2NO74W6yhF7lgRjw9B2Ek

install:
- choco install gitversion.portable -pre -y
- choco install gitversion.portable -pre -y --no-progress

before_build:
- ps: C:\ProgramData\chocolatey\bin\gfv.exe /l console /output buildserver /updateAssemblyInfo
- ps: appveyor-retry nuget restore src\Alphacloud.MSBuild.Xslt.sln

- ps: >-
C:\ProgramData\chocolatey\bin\gfv.exe /l console /output buildserver /updateAssemblyInfo
cd /projects/msbuild-xslt/src
dotnet restore
build_script:
- cmd: '"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /t:BuildAll;Pack /p:PackageVersion="%GitVersion_NuGetVersion%'
- cmd: >-
cd /projects/msbuild-xslt
MSBuild.exe build.proj /t:BuildAll;Pack /p:PackageVersion="%GitVersion_NuGetVersion%
test:
assemblies:
- src\tests\bin\Release\Alphacloud.MSBuild.Xslt.Tests.dll
- src\tests\bin\Release\**\Alphacloud.MSBuild.Xslt.Tests.dll

artifacts:
- path: out/packages/*.nupkg
Expand All @@ -46,8 +56,8 @@
nuget setApiKey $env:NUGET_KEY -verbosity quiet;
appveyor-retry nuget push out\packages\Alphacloud.MSBuild.Xslt.$version.nupkg -source https://www.nuget.org/api/v2/package/ ;
cd src\solution ;
choco pack xslt.portable.nuspec --version $version ;
if ($env:APPVEYOR_REPO_BRANCH -eq 'master') {
choco pack xslt.portable.nuspec --version $version ;
choco apiKey -k $env:CHOCOLATEY_KEY -source https://chocolatey.org/ ;
appveyor-retry choco push msbuild-xslt.portable.$version.nupkg
}
Expand All @@ -56,26 +66,31 @@
pull_requests:
do_not_increment_build_number: true

os: Visual Studio 2015
os: Visual Studio 2017

nuget:
disable_publish_on_pr: true

assembly_info:
patch: false

cache:
- packages -> src\**\packages.config

install:
- choco install gitversion.portable -pre -y
- choco install gitversion.portable -pre -y --no-progress

before_build:
- ps: gitversion /l console /output buildserver /updateAssemblyInfo

- ps: >-
C:\ProgramData\chocolatey\bin\gfv.exe /l console /output buildserver /updateAssemblyInfo
cd /projects/msbuild-xslt/src
dotnet restore
build_script:
- cmd: '"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /t:BuildAll'
- cmd: >-
cd /projects/msbuild-xslt
MSBuild.exe build.proj /t:BuildAll;Pack /p:PackageVersion="%GitVersion_NuGetVersion%
test:
assemblies:
- src\tests\bin\Release\Alphacloud.MSBuild.Xslt.Tests.dll
- src\tests\bin\Release\**\Alphacloud.MSBuild.Xslt.Tests.dll
2 changes: 1 addition & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@



<Target Name="BuildAll" DependsOnTargets="RestorePackages">
<Target Name="BuildAll">
<MSBuild Projects="$(MainSolution)" Properties="Configuration=$(BuildConfig);CreateHardLinksForCopyLocalIfPossible=true" Targets="$(BuildTarget)"
BuildInParallel="true" />
</Target>
Expand Down
21 changes: 12 additions & 9 deletions src/Alphacloud.MSBuild.Xslt.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alphacloud.MSBuild.Xslt", "solution\Alphacloud.MSBuild.Xslt.csproj", "{02353814-7194-4688-B7E2-B8442DFF88A5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Alphacloud.MSBuild.Xslt.Tests", "tests\Alphacloud.MSBuild.Xslt.Tests.csproj", "{CA420B82-1FAB-4FC6-82C3-D1A3C345F710}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alphacloud.MSBuild.Xslt", "solution\Alphacloud.MSBuild.Xslt.csproj", "{02353814-7194-4688-B7E2-B8442DFF88A5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{167CC99C-AFCE-45A3-B8E2-18C1250813EE}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -15,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\README.md = ..\README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alphacloud.MSBuild.Xslt.Tests", "tests\Alphacloud.MSBuild.Xslt.Tests.csproj", "{C8305569-7647-4E9E-AFF3-B449C0A03043}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -25,12 +25,15 @@ Global
{02353814-7194-4688-B7E2-B8442DFF88A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{02353814-7194-4688-B7E2-B8442DFF88A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{02353814-7194-4688-B7E2-B8442DFF88A5}.Release|Any CPU.Build.0 = Release|Any CPU
{CA420B82-1FAB-4FC6-82C3-D1A3C345F710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA420B82-1FAB-4FC6-82C3-D1A3C345F710}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA420B82-1FAB-4FC6-82C3-D1A3C345F710}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA420B82-1FAB-4FC6-82C3-D1A3C345F710}.Release|Any CPU.Build.0 = Release|Any CPU
{C8305569-7647-4E9E-AFF3-B449C0A03043}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C8305569-7647-4E9E-AFF3-B449C0A03043}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C8305569-7647-4E9E-AFF3-B449C0A03043}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C8305569-7647-4E9E-AFF3-B449C0A03043}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0915F9EA-3A61-468A-9778-8AC920BC23B8}
EndGlobalSection
EndGlobal
4 changes: 3 additions & 1 deletion src/Alphacloud.MSBuild.Xslt.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/ProcessingInstructionAttributeIndenting/@EntryValue">OneStep</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/WrapBeforeAttr/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/WrapLongLines/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/WRAP_LINES/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">Default</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue">False</s:Boolean>
Expand All @@ -12,4 +13,5 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="s_" Suffix="" Style="aaBb" /&gt;</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EXml_002ECodeStyle_002EFormatSettingsUpgrade_002EXmlMoveToCommonFormatterSettingsUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
3 changes: 2 additions & 1 deletion src/NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<configuration>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="repositoryPath" value="../packages" />
</config>
Expand Down
107 changes: 20 additions & 87 deletions src/solution/Alphacloud.MSBuild.Xslt.csproj
Original file line number Diff line number Diff line change
@@ -1,89 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{02353814-7194-4688-B7E2-B8442DFF88A5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Alphacloud.MSBuild.Xslt</RootNamespace>
<AssemblyName>Alphacloud.MSBuild.Xslt</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup Label="Build">
<TargetFramework>net46</TargetFramework>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
<HintPath>..\..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Utilities.v4.0" />
<Reference Include="saxon9he-api, Version=9.7.0.14, Culture=neutral, PublicKeyToken=e1fdd002d5083fe6, processorArchitecture=MSIL">
<HintPath>..\..\packages\Saxon-HE.9.7.0.14\lib\net40\saxon9he-api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ErrorMessage.cs" />
<Compile Include="ISingleFileTransformer.cs" />
<Compile Include="Xslt3SingleFileTransform.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SingleFileTransformer.cs" />
<Compile Include="XsltException.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Alphacloud.MSBuild.Xslt.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Xslt.nuspec" />
<None Include="Xslt.Portable.nuspec" />
<None Include="xslt.xsd">
<SubType>Designer</SubType>
</None>

<ItemGroup Label="Package References">
<PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.3.409" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.3.409" />
<PackageReference Include="Saxon-HE-fixedrefs" Version="9.7.0.13" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
6 changes: 3 additions & 3 deletions src/solution/Xslt.Portable.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>msbuild-xslt.portable</id>
<version>0.3.3</version>
<title>XSLT 2 and 3 transformation for MSBuild.</title>
<title>XSLT 2 and 3 transformation for MSBuild</title>
<authors>Alphacloud.net</authors>
<owners>Alphacloud.net</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
Expand All @@ -23,7 +23,7 @@ Upgraded Saxon to 9.7.0.14.
<dependencies></dependencies>
</metadata>
<files>
<file src="bin\Release\*.dll" target="tools" />
<file src="bin\Release\*.targets" target="tools" />
<file src="bin\Release\net46\*.dll" target="tools" />
<file src="*.targets" target="tools" />
</files>
</package>
Loading

0 comments on commit ddf1686

Please sign in to comment.