Skip to content

Added comma to replaced characters in assemblyname #4136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 9 commits into from
Jul 6, 2017
Merged

Added comma to replaced characters in assemblyname #4136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
56c72fb
Added comma to replaced characters in assemblyname
TimCurwick Jun 28, 2017
853ebcc
Added Pester test for Classes runpath
TimCurwick Jun 28, 2017
7eb13b1
Added tags
TimCurwick Jun 28, 2017
0190477
Fixed tags
TimCurwick Jun 28, 2017
5d69d2c
Fixed typo in comments
TimCurwick Jun 28, 2017
c3b823f
Update Scripting.Classes.RunPath.Tests.ps1
TimCurwick Jun 28, 2017
c1a8dd8
Merge pull request #1 from TimCurwick/MStweaks
TimCurwick Jun 28, 2017
3d4cef5
Added tag. Again.
TimCurwick Jun 28, 2017
88c0b9b
Removed redundant test
TimCurwick Jun 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/System.Management.Automation/engine/parser/PSType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,13 +1112,14 @@ internal static Assembly DefineTypes(Parser parser, Ast rootAst, TypeDefinitionA

var definedTypes = new HashSet<string>(StringComparer.OrdinalIgnoreCase);

// First character is a special mark that allows us to cheaply ignore dynamic generated assemblies in ClrFacede.GetAssemblies()
// Two replaces at the end are for not-allowed characters. They are replaced by similar-looking chars.
// First character is a special mark that allows us to cheaply ignore dynamic generated assemblies in ClrFacade.GetAssemblies()
// The replaces at the end are for not-allowed characters. They are replaced by similar-looking chars.
string assemblyName = ClrFacade.FIRST_CHAR_PSASSEMBLY_MARK + (string.IsNullOrWhiteSpace(rootAst.Extent.File)
? "powershell"
: rootAst.Extent.File
.Replace('\\', (char)0x29f9)
.Replace('/', (char)0x29f9)
.Replace(',', (char)0x201a)
.Replace(':', (char)0x0589));

var assembly = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(assemblyName),
Expand Down
20 changes: 20 additions & 0 deletions test/powershell/Language/Classes/Scripting.Classes.RunPath.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Describe "Script with a class definition run path" -Tags "CI" {

$TestCases = @(
@{ FileName = 'MyTest.ps1'; Name = 'path without a comma' }
@{ FileName = 'My,Test.ps1'; Name = 'path with a comma' }
)

It "Script with a class definition can run from a <Name>" -TestCases $TestCases {
param( $FileName )

$FilePath = Join-Path -Path $TestDrive -ChildPath $FileName

@'
class MyClass { static [string]$MyProperty = 'Some value' }
[MyClass]::MyProperty
'@ | Out-File -FilePath $FilePath

( . $FilePath ) | Should Match 'Some value'
}
}