Permalink
Browse files

[#422] Fixes for PackageReference conversion

* update mechanism of restoring nuget packages to avoid finding wrong MSBuild
* Fix System.Web.Mvc references on some test projects to PackageReference
  • Loading branch information...
nickwesselman committed Jul 6, 2018
1 parent 3cb1aa4 commit 8f77beb1d4c73887ea772760fea3627793b966aa
View
@@ -6,7 +6,6 @@ var rename = require("gulp-rename");
var newer = require("gulp-newer");
var util = require("gulp-util");
var runSequence = require("run-sequence");
var nugetRestore = require("gulp-nuget-restore");
var fs = require("fs");
var yargs = require("yargs").argv;
var unicorn = require("./scripts/unicorn.js");
@@ -35,11 +34,10 @@ gulp.task("default",
return runSequence(
"Copy-Sitecore-License",
"Copy-Sitecore-Lib",
"Nuget-Restore",
"Publish-All-Projects",
"Apply-Xml-Transform",
"Sync-Unicorn",
"Publish-Transforms",
"Sync-Unicorn",
callback);
});
@@ -49,7 +47,6 @@ gulp.task("deploy",
return runSequence(
"Copy-Sitecore-License",
"Copy-Sitecore-Lib",
"Nuget-Restore",
"Publish-All-Projects",
"Apply-Xml-Transform",
"Publish-Transforms",
@@ -76,13 +73,6 @@ gulp.task("Copy-Sitecore-Lib",
return gulp.src(files).pipe(gulp.dest("./lib/Sitecore"));
});
gulp.task("Nuget-Restore",
function(callback) {
var solution = "./" + config.solutionName + ".sln";
return gulp.src(solution).pipe(nugetRestore());
});
gulp.task("Publish-All-Projects",
function(callback) {
return runSequence(
@@ -228,7 +218,8 @@ gulp.task("Build-Solution",
toolsVersion: config.buildToolsVersion,
properties: {
Platform: config.buildPlatform
}
},
customArgs: [ "/restore" ]
}));
});
View
@@ -27,7 +27,6 @@
"yargs": "^6.4.0"
},
"devDependencies": {
"gulp-nuget-restore": "^0.4.0"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
@@ -11,7 +11,8 @@
<AssemblyName>Sitecore.Feature.Accounts.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp></NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,6 +39,9 @@
<PackageReference Include="Castle.Core" Version="4.3.0" />
<PackageReference Include="FluentAssertions" Version="5.4.0" />
<PackageReference Include="Lucene.Net" Version="3.0.3" />
<PackageReference Include="Microsoft.AspNet.Mvc">
<Version>5.2.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.Razor" Version="3.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
@@ -107,10 +111,6 @@
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -11,7 +11,8 @@
<AssemblyName>Sitecore.Feature.Demo.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp></NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,6 +39,9 @@
<PackageReference Include="Castle.Core" Version="4.3.0" />
<PackageReference Include="FluentAssertions" Version="5.4.0" />
<PackageReference Include="Lucene.Net" Version="3.0.3" />
<PackageReference Include="Microsoft.AspNet.Mvc">
<Version>5.2.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.Razor" Version="3.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
@@ -97,10 +101,6 @@
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -11,7 +11,8 @@
<AssemblyName>Sitecore.Feature.Multisite.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp></NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,6 +39,9 @@
<PackageReference Include="Castle.Core" Version="4.3.0" />
<PackageReference Include="FluentAssertions" Version="5.4.0" />
<PackageReference Include="Lucene.Net" Version="3.0.3" />
<PackageReference Include="Microsoft.AspNet.Mvc">
<Version>5.2.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.Razor" Version="3.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
@@ -85,10 +89,6 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -39,6 +39,9 @@
<PackageReference Include="Castle.Core" Version="4.3.0" />
<PackageReference Include="FluentAssertions" Version="5.4.0" />
<PackageReference Include="Lucene.Net" Version="3.0.3" />
<PackageReference Include="Microsoft.AspNet.Mvc">
<Version>5.2.3</Version>
</PackageReference>
<PackageReference Include="Microsoft.AspNet.Razor" Version="3.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.3" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
@@ -92,10 +95,6 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />

0 comments on commit 8f77beb

Please sign in to comment.