Skip to content

Commit b6c10be

Browse files
authored
Merge pull request #351 from PowerShell/daviwil/dotnet-cli-redux
Convert all projects to use .NET CLI preview4 tools
2 parents 3d3b0c0 + bad9870 commit b6c10be

File tree

65 files changed

+889
-2357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+889
-2357
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ lock
2626
.corext/gen
2727
registered_data.ini
2828
.vs/
29+
.dotnet/
2930
module/
3031

3132
docs/_site/

.nuget/NuGet.Config

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

.nuget/NuGet.exe

-1.59 MB
Binary file not shown.

.nuget/NuGet.targets

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

.vscode/settings.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Place your settings in this file to overwrite default and user settings.
2+
{
3+
"editor.tabSize": 4,
4+
"editor.insertSpaces": true,
5+
"files.trimTrailingWhitespace": true
6+
}

.vscode/tasks.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"version": "0.1.0",
3+
4+
"windows": {
5+
"command": "${env.windir}\\sysnative\\windowspowershell\\v1.0\\PowerShell.exe",
6+
"args": [ "-NoProfile", "-ExecutionPolicy", "Bypass" ]
7+
},
8+
"linux": {
9+
"command": "/usr/bin/powershell",
10+
"args": [ "-NoProfile" ]
11+
},
12+
"osx": {
13+
"command": "/usr/local/bin/powershell",
14+
"args": [ "-NoProfile" ]
15+
},
16+
17+
"isShellCommand": true,
18+
"showOutput": "always",
19+
20+
// Associate with test task runner
21+
"tasks": [
22+
{
23+
"taskName": "Clean",
24+
"suppressTaskName": true,
25+
"args": [ "Invoke-Build Clean" ]
26+
},
27+
{
28+
"taskName": "Build",
29+
"suppressTaskName": true,
30+
"isBuildCommand": true,
31+
"args": [ "Invoke-Build BuildHost" ]
32+
},
33+
{
34+
"taskName": "Full Build",
35+
"suppressTaskName": true,
36+
"args": [ "Invoke-Build" ]
37+
},
38+
{
39+
"taskName": "Test",
40+
"suppressTaskName": true,
41+
"isTestCommand": true,
42+
"args": [ "Invoke-Build Test" ]
43+
}
44+
]
45+
}

NuGet.Config

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
<packageSources>
7+
<clear />
8+
<add key="CI Builds (dotnet-core)" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
9+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
10+
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
11+
</packageSources>
12+
</configuration>

PowerShellEditorServices.Common.props

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
3+
4+
<PropertyGroup>
5+
<VersionPrefix>0.9.0</VersionPrefix>
6+
<VersionSuffix>beta</VersionSuffix>
7+
<Company>Microsoft</Company>
8+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
9+
<PackageTags>PowerShell;editor;development;language;debugging</PackageTags>
10+
<PackageLicenseUrl>https://raw.githubusercontent.com/PowerShell/PowerShellEditorServices/master/LICENSE</PackageLicenseUrl>
11+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
12+
<RepositoryType>git</RepositoryType>
13+
<RepositoryUrl>https://github.com/PowerShell/PowerShellEditorServices</RepositoryUrl>
14+
</PropertyGroup>
15+
</Project>

PowerShellEditorServices.NoNano.sln

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

0 commit comments

Comments
 (0)