Skip to content

Fix P/Invoke signatures for the resource updater. #3310

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
merged 1 commit into from
Jun 7, 2019
Merged

Fix P/Invoke signatures for the resource updater. #3310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Tasks/Microsoft.NET.Build.Tasks/ResourceUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ private sealed class Kernel32
// Native methods for updating resources
//

[DllImport(nameof(Kernel32), SetLastError=true)]
[DllImport(nameof(Kernel32), CharSet = CharSet.Unicode, SetLastError=true)]
public static extern SafeUpdateHandle BeginUpdateResource(string pFileName,
[MarshalAs(UnmanagedType.Bool)]bool bDeleteExistingResources);

Expand Down Expand Up @@ -71,7 +71,7 @@ public enum LoadLibraryFlags : uint
LOAD_LIBRARY_AS_IMAGE_RESOURCE = 0x00000020
}

[DllImport(nameof(Kernel32), SetLastError=true)]
[DllImport(nameof(Kernel32), CharSet = CharSet.Unicode, SetLastError=true)]
public static extern IntPtr LoadLibraryEx(string lpFileName,
IntPtr hReservedNull,
LoadLibraryFlags dwFlags);
Expand Down
21 changes: 21 additions & 0 deletions src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,8 +696,29 @@ public void ItHasNoPackageReferences()
packageReferences
.Should()
.BeEmpty();
}

[WindowsOnlyFact]
public void It_builds_with_unicode_characters_in_path()
{
var testProject = new TestProject()
{
Name = "Prj_すおヸょー",
TargetFrameworks = "netcoreapp3.0",
IsSdkProject = true,
IsExe = true,
};

var testAsset = _testAssetsManager
.CreateTestProject(testProject)
.Restore(Log, testProject.Name);

var buildCommand = new BuildCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));

buildCommand
.Execute()
.Should()
.Pass();
}
}
}