Skip to content

Commit 9318b7b

Browse files
FriedrichWeinmannFriedrichWeinmann
authored
Merge pull request #1 from FriedrichWeinmann/development
2.0.0.0
2 parents 089dbea + 73b602b commit 9318b7b

Some content is hidden

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

47 files changed

+3233
-79
lines changed

‎.gitignore

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@
55
.vscode/*
66
*.psproj
77

8+
# Ignore staging info from Visual Studio
9+
library/PSModuleDevelopment/.vs/PSModuleDevelopment/v15/.suo
10+
library/PSModuleDevelopment/PSModuleDevelopment/bin/*
11+
library/PSModuleDevelopment/PSModuleDevelopment/obj/*
12+
813
# ignore library
9-
PSModuleDevelopment/bin/PSModuleDevelopment.dll
10-
PSModuleDevelopment/bin/PSModuleDevelopment.xml
11-
PSModuleDevelopment/bin/PSModuleDevelopment.pdb
14+
# PSModuleDevelopment/bin/PSModuleDevelopment.dll
15+
# PSModuleDevelopment/bin/PSModuleDevelopment.xml
16+
# PSModuleDevelopment/bin/PSModuleDevelopment.pdb
1217

1318
# ignore PowerShell Studio MetaData
1419
PSModuleDevelopment/PSModuleDevelopment.psproj
1520
PSModuleDevelopment/PSModuleDevelopment.psproj.bak
16-
PSModuleDevelopment/PSModuleDevelopment.psprojs
21+
PSModuleDevelopment/PSModuleDevelopment.psprojs
22+
PSModuleDevelopment/PSModuleDevelopment.psproj

‎PSModuleDevelopment/PSModuleDevelopment.psd1

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@{
22

33
# Script module or binary module file associated with this manifest
4-
ModuleToProcess = 'PSModuleDevelopment.psm1'
4+
RootModule = 'PSModuleDevelopment.psm1'
55

66
# Version number of this module.
7-
ModuleVersion = '1.3.1.17'
7+
ModuleVersion = '2.0.0.0'
88

99
# ID used to uniquely identify this module
1010
GUID = '37dd5fce-e7b5-4d57-ac37-832055ce49d6'
@@ -41,10 +41,10 @@
4141

4242
# Modules that must be imported into the global environment prior to importing
4343
# this module
44-
RequiredModules = @("PSFramework")
44+
RequiredModules = @(@{ ModuleName='PSFramework'; ModuleVersion='0.9.4.9' })
4545

4646
# Assemblies that must be loaded prior to importing this module
47-
RequiredAssemblies = @()
47+
RequiredAssemblies = @('bin\PSModuleDevelopment.dll')
4848

4949
# Script files (.ps1) that are run in the caller's environment prior to
5050
# importing this module
@@ -54,22 +54,34 @@
5454
TypesToProcess = @()
5555

5656
# Format files (.ps1xml) to be loaded when importing this module
57-
FormatsToProcess = @()
57+
FormatsToProcess = @('xml\PSModuleDevelopment.Format.ps1xml')
5858

5959
# Modules to import as nested modules of the module specified in
6060
# ModuleToProcess
6161
NestedModules = @()
6262

6363
# Functions to export from this module
6464
FunctionsToExport = @(
65-
'Get-HelpEx',
66-
'Get-ModuleDebug',
67-
'Import-ModuleDebug',
68-
'Measure-CommandEx',
69-
'New-PssModuleProject',
70-
'Remove-ModuleDebug',
71-
'Restart-Shell',
72-
'Set-ModuleDebug'
65+
'Expand-PSMDTypeName',
66+
'Find-PSMDFileContent',
67+
'Find-PSMDType',
68+
'Get-PSMDAssembly',
69+
'Get-PSMDConstructor',
70+
'Get-PSMDHelpEx',
71+
'Get-PSMDModuleDebug',
72+
'Import-PSMDModuleDebug',
73+
'Measure-PSMDCommandEx',
74+
'New-PSMDHeader',
75+
'New-PSMDFormatTableDefinition',
76+
'New-PssModuleProject',
77+
'Remove-PSMDModuleDebug',
78+
'Rename-PSMDParameter',
79+
'Restart-PSMDShell',
80+
'Set-PSMDModuleDebug',
81+
'Set-PSMDCmdletBinding',
82+
'Set-PSMDModulePath',
83+
'Set-PSMDParameterHelp',
84+
'Split-PSMDScriptFile'
7385
)
7486

7587
# Cmdlets to export from this module
@@ -80,8 +92,9 @@
8092

8193
# Aliases to export from this module
8294
AliasesToExport = @(
83-
'hex',
84-
'Get-ExHelp',
95+
'find',
96+
'hex',
97+
'Restart-Shell',
8598
'rss',
8699
'ipmod',
87100
'smd'

‎PSModuleDevelopment/PSModuleDevelopment.psm1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
$script:PSModuleDevelopmentModuleRoot = $PSScriptRoot
2+
$script:PSModuleDevelopmentModuleVersion = '2.0.0.0'
23

34
$script:doDotSource = $false
45
if (Get-PSFConfigValue -Name PSModuleDevelopment.Import.DoDotSource) { $script:doDotSource = $true }
@@ -35,7 +36,7 @@ function Import-PSMDFile
3536

3637

3738
# Perform Actions before loading the rest of the content
38-
. Import-PSMDFile -Path "$PSModuleDevelopmentModuleRoot\scripts\preload.ps1"
39+
. Import-PSMDFile -Path "$PSModuleDevelopmentModuleRoot\internal\scripts\preload.ps1"
3940

4041
#region Load functions
4142
foreach ($function in (Get-ChildItem "$PSModuleDevelopmentModuleRoot\functions" -Recurse -File -Filter "*.ps1"))
@@ -45,4 +46,4 @@ foreach ($function in (Get-ChildItem "$PSModuleDevelopmentModuleRoot\functions"
4546
#endregion Load functions
4647

4748
# Perform Actions after loading the module contents
48-
. Import-PSMDFile -Path "$PSModuleDevelopmentModuleRoot\scripts\postload.ps1"
49+
. Import-PSMDFile -Path "$PSModuleDevelopmentModuleRoot\internal\scripts\postload.ps1"

‎PSModuleDevelopment/PSModuleDevelopment.psproj

Lines changed: 42 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,63 @@
1-
<Project Synchronized="True" SyncFilter="*.ps1;*.psm1;*.psd1;*.psxml;*.psf;*.pss;*.xml; *.txt">
1+
<Project Synchronized="True" SyncFilter="*.ps1;*.psm1;*.psd1;*.psxml;*.psf;*.pss;*.xml; *.txt;*.dll">
22
<Version>2.0</Version>
33
<FileID>37dd5fce-e7b5-4d57-ac37-832055ce49d6</FileID>
44
<ProjectType>1</ProjectType>
55
<Folders>
66
<Folder>en-us</Folder>
77
<Folder>functions</Folder>
8-
<Folder>scripts</Folder>
9-
<Folder>xml</Folder>
8+
<Folder>internal\scripts</Folder>
109
<Folder>functions\utility</Folder>
1110
<Folder>functions\moduledebug</Folder>
1211
<Folder>functions\performance</Folder>
1312
<Folder>functions\help</Folder>
1413
<Folder>snippets</Folder>
14+
<Folder>functions\wix</Folder>
15+
<Folder>internal</Folder>
16+
<Folder>internal\configurations</Folder>
17+
<Folder>functions\format</Folder>
18+
<Folder>functions\refactor</Folder>
19+
<Folder>functions\assembly</Folder>
20+
<Folder>bin</Folder>
21+
<Folder>xml</Folder>
22+
<Folder>internal\scripts\NewFolder1</Folder>
1523
</Folders>
1624
<Files>
1725
<File Build="2">PSModuleDevelopment.psd1</File>
1826
<File Build="0">PSModuleDevelopment.psm1</File>
19-
<File Build="2" Shared="True" ReferenceFunction="Invoke-preload_ps1">scripts\preload.ps1</File>
20-
<File Build="2" Shared="True" ReferenceFunction="Invoke-postload_ps1">scripts\postload.ps1</File>
21-
<File Build="2" Shared="True" ReferenceFunction="Invoke-Restart-Shell_ps1">functions\utility\Restart-Shell.ps1</File>
22-
<File Build="2" Shared="True" ReferenceFunction="Invoke-Set-ModuleDebug_ps1">functions\moduledebug\Set-ModuleDebug.ps1</File>
23-
<File Build="2" Shared="True" ReferenceFunction="Invoke-Get-ModuleDebug_ps1">functions\moduledebug\Get-ModuleDebug.ps1</File>
24-
<File Build="2" Shared="True" ReferenceFunction="Invoke-Remove-ModuleDebug_ps1">functions\moduledebug\Remove-ModuleDebug.ps1</File>
25-
<File Build="2" Shared="True" ReferenceFunction="Invoke-Import-ModuleDebug_ps1">functions\moduledebug\Import-ModuleDebug.ps1</File>
26-
<File Build="2" Shared="True" ReferenceFunction="Invoke-Get-HelpEx_ps1">functions\help\Get-HelpEx.ps1</File>
27-
<File Build="2" Shared="True" ReferenceFunction="Invoke-Measure-CommandEx_ps1">functions\performance\Measure-CommandEx.ps1</File>
27+
<File Build="2" Shared="True" ReferenceFunction="Invoke-preload_ps1">internal\scripts\preload.ps1</File>
28+
<File Build="2" Shared="True" ReferenceFunction="Invoke-postload_ps1">internal\scripts\postload.ps1</File>
29+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Restart-PSMDShell_ps1">functions\utility\Restart-PSMDShell.ps1</File>
30+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Set-PSMDModuleDebug_ps1">functions\moduledebug\Set-PSMDModuleDebug.ps1</File>
31+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Get-PSMDModuleDebug_ps1">functions\moduledebug\Get-PSMDModuleDebug.ps1</File>
32+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Remove-PSMDModuleDebug_ps1">functions\moduledebug\Remove-PSMDModuleDebug.ps1</File>
33+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Import-PSMDModuleDebug_ps1">functions\moduledebug\Import-PSMDModuleDebug.ps1</File>
34+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Get-PSMDHelpEx_ps1">functions\help\Get-PSMDHelpEx.ps1</File>
35+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Measure-PSMDCommandEx_ps1">functions\performance\Measure-PSMDCommandEx.ps1</File>
2836
<File Build="2" Shared="False" ReferenceFunction="Invoke-New-PssModuleProject_ps1">functions\utility\New-PssModuleProject.ps1</File>
2937
<File Build="2">en-us\about_psmoduledevelopment.help.txt</File>
3038
<File Build="2" Shared="False" ReferenceFunction="Invoke-Set-PSMDModulePath_ps1">functions\utility\Set-PSMDModulePath.ps1</File>
39+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Get-PSMDWixConfig_ps1">functions\wix\Get-PSMDWixConfig.ps1</File>
40+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Set-PSMDWixConfig_ps1">functions\wix\Set-PSMDWixConfig.ps1</File>
41+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Invoke-PSMDWixBuild_ps1">functions\wix\Invoke-PSMDWixBuild.ps1</File>
42+
<File Build="2" Shared="False" ReferenceFunction="Invoke-Invoke-PSMDWixBuild2_ps1">functions\wix\Invoke-PSMDWixBuild2.ps1</File>
43+
<File Build="2" Shared="False" ReferenceFunction="Invoke-wix_ps1">internal\configurations\wix.ps1</File>
44+
<File Build="2" Shared="False" ReferenceFunction="Invoke-debug_ps1">internal\configurations\debug.ps1</File>
45+
<File Build="2" Shared="False" ReferenceFunction="Invoke-license_ps1">internal\scripts\license.ps1</File>
46+
<File Build="2" Shared="True" ReferenceFunction="Invoke-New-PSMDFormatTableDefinition_ps1">functions\format\New-PSMDFormatTableDefinition.ps1</File>
47+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Rename-PSMDParameter_ps1">functions\refactor\Rename-PSMDParameter.ps1</File>
48+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Expand-PSMDTypeName_ps1">functions\assembly\Expand-PSMDTypeName.ps1</File>
49+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Set-PSMDParameterHelp_ps1">functions\refactor\Set-PSMDParameterHelp.ps1</File>
50+
<File Build="2">bin\PSModuleDevelopment.xml</File>
51+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Set-PSMDCmdletBinding_ps1">functions\refactor\Set-PSMDCmdletBinding.ps1</File>
52+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Split-PSMDScriptFile_ps1">functions\refactor\Split-PSMDScriptFile.ps1</File>
53+
<File Build="2">bin\PSModuleDevelopment.dll</File>
54+
<File Build="2" Shared="True" ReferenceFunction="Invoke-New-PSMDHeader_ps1">functions\utility\New-PSMDHeader.ps1</File>
55+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Find-PSMDFileContent_ps1">functions\utility\Find-PSMDFileContent.ps1</File>
56+
<File Build="2" Shared="True" ReferenceFunction="Invoke-utility_ps1">internal\configurations\utility.ps1</File>
57+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Get-PSMDConstructor_ps1">functions\assembly\Get-PSMDConstructor.ps1</File>
58+
<File Build="2">xml\PSModuleDevelopment.Format.ps1xml</File>
59+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Get-PSMDAssembly_ps1">functions\assembly\Get-PSMDAssembly.ps1</File>
60+
<File Build="2" Shared="True" ReferenceFunction="Invoke-Find-PSMDType_ps1">functions\assembly\Find-PSMDType.ps1</File>
3161
</Files>
3262
<StartupScript>F:\Synchronized Data\Scripte\Powershell Studio\Projects\PSModuleDevelopment\Test-Module.ps1</StartupScript>
3363
</Project>

‎PSModuleDevelopment/bin/PSModuleDevelopment.dll

7 KB
Binary file not shown.

‎PSModuleDevelopment/bin/PSModuleDevelopment.pdb

17.5 KB
Binary file not shown.

‎PSModuleDevelopment/bin/PSModuleDevelopment.xml

Lines changed: 166 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)