Skip to content

Commit c39ef64

Browse files
author
Paul van Brenk
committed
Replace packages.config with project.json
This way we can use a wildcard for the version, which helps prevent issues when referencing MicroBuild packages.
1 parent 85b1c13 commit c39ef64

File tree

6 files changed

+28
-6
lines changed

6 files changed

+28
-6
lines changed

EnvironmentSetup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ if ($microbuild -or ($vstarget -eq "15.0" -and -not $skipRestore)) {
6868
Write-Output ""
6969
Write-Output "Installing Nuget MicroBuild packages"
7070

71-
& "$rootdir\Nodejs\.nuget\nuget.exe" restore "$rootdir\Nodejs\Setup\swix\packages.config" -PackagesDirectory "$packagedir"
71+
& "$rootdir\Nodejs\.nuget\nuget.exe" restore "$rootdir\Nodejs\Setup\swix\project.json" -PackagesDirectory "$packagedir" -ConfigFile "$rootdir\Nodejs\.nuget\nuget.config"
7272

7373
# If using the -microbuild switch, ONLY do the microbuild restore (this behavior is expected by the build servers).
7474
if($microbuild) {

Nodejs/Setup/swix/Microsoft.VisualStudio.NodejsTools.Targets.swixproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
6+
</PropertyGroup>
7+
38
<Import Project="..\SetupProjectBefore.settings" />
49
<Import Project="$(PackagesPath)\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" />
510

Nodejs/Setup/swix/NodejsTools.Profiling.vsmanproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build"
33
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
5+
<PropertyGroup>
6+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
7+
</PropertyGroup>
8+
49
<Import Project="..\SetupProjectBefore.settings" />
510

611
<PropertyGroup>

Nodejs/Setup/swix/NodejsTools.vsmanproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" DefaultTargets="Build"
33
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4+
5+
<PropertyGroup>
6+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
7+
</PropertyGroup>
8+
49
<Import Project="..\SetupProjectBefore.settings" />
510

611
<PropertyGroup>

Nodejs/Setup/swix/packages.config

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

Nodejs/Setup/swix/project.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"dependencies": {
3+
"MicroBuild.Core": "0.2.0",
4+
"MicroBuild.Plugins.SwixBuild": "1.0.*"
5+
},
6+
"frameworks": {
7+
"net461": {}
8+
},
9+
"runtimes": {
10+
"win": {}
11+
}
12+
}

0 commit comments

Comments
 (0)