Updated to always use MSBuild 14.0 (2015)

dependabot/npm_and_yarn/BuildServer/eslint-7.2.0
Inga 🏳‍🌈 9 years ago
parent 601fa5cfdf
commit b8092caa47
  1. 3
      DotNetBuilder/Compiler.cs
  2. 31
      DotNetBuilder/MicroBuildServer.DotNetBuilder.csproj
  3. 2
      DotNetBuilder/app.config
  4. 8
      DotNetBuilder/packages.config

@ -74,6 +74,7 @@ namespace MicroBuildServer.DotNetBuilder
var globalProperty = new Dictionary<string, string>(); var globalProperty = new Dictionary<string, string>();
globalProperty.Add("Configuration", "Release"); globalProperty.Add("Configuration", "Release");
globalProperty.Add("Platform", "Any CPU"); globalProperty.Add("Platform", "Any CPU");
globalProperty.Add("VisualStudioVersion", "14.0");
if (!string.IsNullOrEmpty(request.OutputDirectory)) if (!string.IsNullOrEmpty(request.OutputDirectory))
{ {
globalProperty.Add("OutputDirectory", request.OutputDirectory); globalProperty.Add("OutputDirectory", request.OutputDirectory);
@ -89,7 +90,7 @@ namespace MicroBuildServer.DotNetBuilder
globalProperty.Add("CodeAnalysisRuleSet", request.CodeAnalysisRuleSet); globalProperty.Add("CodeAnalysisRuleSet", request.CodeAnalysisRuleSet);
} }
var buildRequest = new BuildRequestData(request.SolutionPath, globalProperty, null, new [] { request.Target }, null); var buildRequest = new BuildRequestData(request.SolutionPath, globalProperty, "14.0", new [] { request.Target }, null);
var parameters = new BuildParameters(pc); var parameters = new BuildParameters(pc);
parameters.Loggers = new ILogger[] { logger }; parameters.Loggers = new ILogger[] { logger };

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="12.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')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MicroBuildServer.DotNetBuilder</RootNamespace> <RootNamespace>MicroBuildServer.DotNetBuilder</RootNamespace>
<AssemblyName>MicroBuildServer.DotNetBuilder</AssemblyName> <AssemblyName>MicroBuildServer.DotNetBuilder</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
@ -23,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
@ -32,16 +34,27 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\packages\NUnit.Runners.2.6.3\tools\lib\log4net.dll</HintPath> <HintPath>..\packages\NUnit.Runners.2.6.3\tools\lib\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Build" /> <Reference Include="Microsoft.Build">
<Reference Include="Microsoft.Build.Framework" /> <HintPath>C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.dll</HintPath>
<Reference Include="Microsoft.Build.Utilities.v4.0" /> </Reference>
<Reference Include="Newtonsoft.Json"> <Reference Include="Microsoft.Build.Engine">
<HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Engine.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Build.Framework">
<HintPath>C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Framework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Build.Utilities.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>C:\Program Files (x86)\MSBuild\14.0\Bin\Microsoft.Build.Utilities.Core.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="NuGet"> <Reference Include="NuGet">
<HintPath>..\packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe</HintPath> <HintPath>..\packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe</HintPath>
@ -94,7 +107,9 @@
<Compile Include="TestRequest.cs" /> <Compile Include="TestRequest.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

@ -8,4 +8,4 @@
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" /> <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net46" />
<package id="NuGet.CommandLine" version="2.8.5" targetFramework="net40" /> <package id="NuGet.CommandLine" version="2.8.5" targetFramework="net4" />
<package id="NUnit" version="2.6.3" targetFramework="net40" /> <package id="NUnit" version="2.6.3" targetFramework="net4" />
<package id="NUnit.Runners" version="2.6.3" targetFramework="net40" /> <package id="NUnit.Runners" version="2.6.3" targetFramework="net4" />
</packages> </packages>
Loading…
Cancel
Save