Skip to content

Commit 8babf2c

Browse files
powercodepowercode
committed
3.1.0. Support for both Core and Desktop. Bugfixes
1 parent 595b9f8 commit 8babf2c

9 files changed

Lines changed: 95 additions & 214 deletions

File tree

‎PSEverything.sln‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.27428.2011
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PSEverything", "PSEverything\PSEverything.csproj", "{D488ED8A-1B48-40F9-A4C0-4B82C9B8D945}"
7-
EndProject
86
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PSEverythingTests", "Tests\PSEverythingTests\PSEverythingTests.csproj", "{C66B6A58-A206-4A9C-8686-4B06DFB9B59B}"
97
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PSEverything", "PSEverything\PSEverything.csproj", "{DA38C5A1-7177-4ECB-AF2A-E00D7E7B94C1}"
9+
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
1313
Release|Any CPU = Release|Any CPU
1414
EndGlobalSection
1515
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{D488ED8A-1B48-40F9-A4C0-4B82C9B8D945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{D488ED8A-1B48-40F9-A4C0-4B82C9B8D945}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{D488ED8A-1B48-40F9-A4C0-4B82C9B8D945}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{D488ED8A-1B48-40F9-A4C0-4B82C9B8D945}.Release|Any CPU.Build.0 = Release|Any CPU
2016
{C66B6A58-A206-4A9C-8686-4B06DFB9B59B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2117
{C66B6A58-A206-4A9C-8686-4B06DFB9B59B}.Debug|Any CPU.Build.0 = Debug|Any CPU
2218
{C66B6A58-A206-4A9C-8686-4B06DFB9B59B}.Release|Any CPU.ActiveCfg = Release|Any CPU
2319
{C66B6A58-A206-4A9C-8686-4B06DFB9B59B}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{DA38C5A1-7177-4ECB-AF2A-E00D7E7B94C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{DA38C5A1-7177-4ECB-AF2A-E00D7E7B94C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{DA38C5A1-7177-4ECB-AF2A-E00D7E7B94C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{DA38C5A1-7177-4ECB-AF2A-E00D7E7B94C1}.Release|Any CPU.Build.0 = Release|Any CPU
2424
EndGlobalSection
2525
GlobalSection(SolutionProperties) = preSolution
2626
HideSolutionNode = FALSE

‎PSEverything/PSEverything.csproj‎

Lines changed: 55 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,58 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{D488ED8A-1B48-40F9-A4C0-4B82C9B8D945}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>PSEverything</RootNamespace>
11-
<AssemblyName>PSEverything</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<Reference Include="Microsoft.PowerShell.Commands.Utility, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
34-
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\Microsoft.PowerShell.Commands.Utility\v4.0_3.0.0.0__31bf3856ad364e35\Microsoft.PowerShell.Commands.Utility.dll</HintPath>
36-
</Reference>
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Microsoft.PowerShell.5.ReferenceAssemblies.1.0.0\lib\net4\System.Management.Automation.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="System.Xml.Linq" />
44-
<Reference Include="System.Data.DataSetExtensions" />
45-
<Reference Include="Microsoft.CSharp" />
46-
<Reference Include="System.Data" />
47-
<Reference Include="System.Xml" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<Compile Include="ArgumentCompleter.cs" />
51-
<Compile Include="Everything.cs" />
52-
<Compile Include="NativeMethods32.cs" />
53-
<Compile Include="NativeMethods64.cs" />
54-
<Compile Include="Properties\AssemblyInfo.cs" />
55-
<Compile Include="SearchEverythingCommand.cs" />
56-
<Compile Include="SelectEverythingStringCommand.cs" />
57-
</ItemGroup>
58-
<ItemGroup>
59-
<Content Include="PSEverything.dll-Help.xml">
60-
<SubType>Designer</SubType>
61-
</Content>
62-
</ItemGroup>
63-
<ItemGroup>
64-
<Content Include="PSEverything.psd1" />
65-
</ItemGroup>
66-
<ItemGroup>
67-
<Content Include="..\LICENSE">
68-
<Link>LICENSE</Link>
69-
</Content>
70-
</ItemGroup>
71-
<ItemGroup>
72-
<Content Include="dll\Everything*.dll">
73-
<Link>%(Filename)%(Extension)</Link>
74-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
75-
</Content>
76-
</ItemGroup>
77-
<ItemGroup>
78-
<None Include="packages.config" />
79-
</ItemGroup>
80-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
81-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
82-
Other similar extension points exist, see Microsoft.Common.targets.
83-
<Target Name="BeforeBuild">
84-
</Target>
1+
<Project Sdk="Microsoft.NET.Sdk">
852

86-
-->
87-
<Target Name="AfterBuild">
88-
<ItemGroup>
89-
<ModuleFiles Include="$(TargetPath)" />
90-
<ModuleFiles Include="@(Content)" />
91-
</ItemGroup>
923
<PropertyGroup>
93-
<ModuleDir>$(TargetDir)\PSEverything</ModuleDir>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<PackageId>PSEverything</PackageId>
6+
<Version>3.1.0</Version>
7+
<Authors>Powercode</Authors>
8+
<Product>PSEverything</Product>
9+
<Description>Blazingly fast file searches with voidtools Everything</Description>
10+
<PackageLicenseUrl>https://raw.githubusercontent.com/powercode/PSEverything/master/LICENSE</PackageLicenseUrl>
11+
<PackageProjectUrl>https://github.com/powercode/PSEverything</PackageProjectUrl>
12+
<RepositoryUrl>https://github.com/powercode/PSEverything</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
9414
</PropertyGroup>
95-
<MakeDir Directories="$(ModuleDir)" />
96-
<Copy SourceFiles="@(ModuleFiles)" DestinationFolder="$(ModuleDir)" SkipUnchangedFiles="true" />
97-
</Target>
98-
</Project>
15+
16+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
17+
<LangVersion>latest</LangVersion>
18+
</PropertyGroup>
19+
20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
21+
<LangVersion>latest</LangVersion>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0-preview-01" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<Content Include="..\LICENSE">
30+
<Link>LICENSE</Link>
31+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
32+
</Content>
33+
<Content Include="PSEverything.psd1;PSEverything.dll-Help.xml">
34+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35+
</Content>
36+
</ItemGroup>
37+
<ItemGroup>
38+
<Content Include="dll\Everything*.dll">
39+
<Link>%(Filename)%(Extension)</Link>
40+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
41+
</Content>
42+
</ItemGroup>
43+
<ItemGroup>
44+
<Folder Include="Properties\" />
45+
</ItemGroup>
46+
47+
<Target Name="AfterBuild">
48+
<ItemGroup>
49+
<ModuleFiles Include="$(TargetPath)" />
50+
<ModuleFiles Include="@(Content)" />
51+
</ItemGroup>
52+
<PropertyGroup>
53+
<ModuleDir>$(TargetDir)\PSEverything</ModuleDir>
54+
</PropertyGroup>
55+
<MakeDir Directories="$(ModuleDir)" />
56+
<Copy SourceFiles="@(ModuleFiles)" DestinationFolder="$(ModuleDir)" SkipUnchangedFiles="true" />
57+
</Target>
58+
</Project>

‎PSEverything/PSEverything.psd1‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,24 @@
1-
#
2-
# Module manifest for module 'PSEverything'
3-
#
4-
# Generated by: sgustafsson
5-
#
6-
# Generated on: 2015-03-18
7-
#
81

92
@{
10-
11-
# Script module or binary module file associated with this manifest.
123
RootModule = 'PSEverything.dll'
13-
14-
# Version number of this module.
15-
ModuleVersion = '2.3.0'
16-
17-
# ID used to uniquely identify this module
4+
ModuleVersion = '3.1.0'
185
GUID = 'f262ec02-4a88-49e5-94da-e25aab9cbf7a'
19-
20-
# Author of this module
216
Author = 'Staffan Gustafsson'
22-
23-
# Company or vendor of this module
247
CompanyName = 'PowerCode Consulting AB'
25-
26-
# Copyright statement for this module
278
Copyright = '(c) 2016 sgustafsson. All rights reserved.'
28-
29-
# Description of the functionality provided by this module
309
Description = 'Powershell access to Everything - Blazingly fast file system searches'
31-
32-
# Minimum version of the Windows PowerShell engine required by this module
33-
PowerShellVersion = '5.0.0'
34-
35-
# Minimum version of Microsoft .NET Framework required by this module
36-
DotNetFrameworkVersion = '4.5'
37-
38-
39-
# Functions to export from this module
10+
PowerShellVersion = '5.1'
11+
CompatiblePSEditions = "Desktop", "Core"
4012
FunctionsToExport = ''
41-
42-
# Cmdlets to export from this module
4313
CmdletsToExport = 'Search-Everything', 'Select-EverythingString'
44-
45-
# Variables to export from this module
4614
VariablesToExport = ''
47-
48-
# Aliases to export from this module
4915
AliasesToExport = 'se', 'sles'
50-
51-
# List of all files packaged with this module
5216
FileList = 'Everything32.dll', 'Everything64.dll', 'LICENSE', 'PSEverything.dll', 'PSEverything.dll-Help.xml', 'PSEverything.psd1'
53-
54-
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
5517
PrivateData = @{
56-
5718
PSData = @{
58-
59-
# Tags applied to this module. These help with module discovery in online galleries.
6019
Tags = @('Search', 'Everything', 'voidtools', 'regex', 'grep')
61-
62-
# A URL to the license for this module.
6320
LicenseUri = 'https://raw.githubusercontent.com/powercode/PSEverything/master/LICENSE'
64-
65-
# A URL to the main website for this project.
6621
ProjectUri = 'https://github.com/powercode/PSEverything'
67-
68-
# ReleaseNotes of this module
6922
ReleaseNotes = @'
7023
2.3: Bug fixes. Sorted output.
7124
2.1: Upgrading to SDK matching 1.4.1.809b - Fixing hang when calling from Eleveated powershell
@@ -82,9 +35,7 @@ Fixing issue where an error was written in Select-EverythingString when Search-E
8235
1.3.1:
8336
Bug fix for -Filter that didn't work in combination with non-global searches.
8437
'@
85-
86-
} # End of PSData hashtable
87-
88-
} # End of PrivateData hashtable
38+
}
39+
}
8940
}
9041

‎PSEverything/Properties/AssemblyInfo.cs‎

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

‎PSEverything/SearchEverythingCommand.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
namespace PSEverything
66
{
77
[Cmdlet(VerbsCommon.Search, "Everything", SupportsPaging = true, DefaultParameterSetName = "default")]
8-
[OutputType(typeof(string))]
9-
[OutputType(typeof(string[]))]
10-
[Alias("se")]
8+
[OutputType(new []{typeof(string)})]
9+
[OutputType(new[]{typeof(string[])})]
10+
[Alias(new[]{"se" })]
1111
public sealed class SearchEverythingCommand : PSCmdlet , IDisposable
1212
{
1313
[Parameter(ParameterSetName = "default")]
@@ -22,19 +22,19 @@ public sealed class SearchEverythingCommand : PSCmdlet , IDisposable
2222
[Parameter(ParameterSetName = "default")]
2323
public string[] Extension { get; set; }
2424

25-
[Alias("pi")]
25+
[Alias(new[] {"pi"})]
2626
[Parameter(ParameterSetName = "default")]
2727
public string[] PathInclude { get; set; }
2828

29-
[Alias("pe")]
29+
[Alias(new[] {"pe"})]
3030
[Parameter(ParameterSetName = "default")]
3131
public string[] PathExclude { get; set; }
3232

33-
[Alias("foi")]
33+
[Alias(new[] {"foi"})]
3434
[Parameter(ParameterSetName = "default")]
3535
public string[] FolderInclude { get; set; }
3636

37-
[Alias("foe")]
37+
[Alias(new[] {"foe"})]
3838
[Parameter(ParameterSetName = "default")]
3939
public string[] FolderExclude { get; set; }
4040

‎PSEverything/SelectEverythingStringCommand.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
namespace PSEverything
99
{
1010
[Cmdlet(VerbsCommon.Select, "EverythingString", DefaultParameterSetName = "default")]
11-
[OutputType("Microsoft.PowerShell.Commands.MatchInfo")]
12-
[Alias("sles")]
11+
[OutputType(new[]{"Microsoft.PowerShell.Commands.MatchInfo" })]
12+
[Alias(new[] {"sles"})]
1313
public class SelectEverythingStringCommand : PSCmdlet
1414
{
1515
static readonly string[] SearchParamNames = new[]{
@@ -49,7 +49,7 @@ public class SelectEverythingStringCommand : PSCmdlet
4949
[Parameter]
5050
public SwitchParameter NotMatch { get; set; }
5151

52-
[ValidateSet("unicode", "utf7", "utf8", "utf32", "ascii", "bigendianunicode", "default", "oem")]
52+
[ValidateSet(new[]{"unicode", "utf7", "utf8", "utf32", "ascii", "bigendianunicode", "default", "oem" })]
5353
[ValidateNotNullOrEmpty]
5454
public string Encoding { get; set; }
5555

@@ -71,19 +71,19 @@ public class SelectEverythingStringCommand : PSCmdlet
7171
public string[] Extension { get; set; }
7272

7373
[Parameter(ParameterSetName = "default")]
74-
[Alias("pi")]
74+
[Alias(new[] {"pi"})]
7575
public string[] PathInclude { get; set; }
7676

7777
[Parameter(ParameterSetName = "default")]
78-
[Alias("pe")]
78+
[Alias(new[] {"pe"})]
7979
public string[] PathExclude { get; set; }
8080

8181
[Parameter(ParameterSetName = "default")]
82-
[Alias("fi")]
82+
[Alias(new[] {"fi"})]
8383
public string[] FolderInclude { get; set; }
8484

8585
[Parameter(ParameterSetName = "default")]
86-
[Alias("fe")]
86+
[Alias(new[] {"fe"})]
8787
public string[] FolderExclude { get; set; }
8888

8989
[Parameter(ParameterSetName = "default")]

0 commit comments

Comments
 (0)