diff options
| author | Eric Mellino <erme@microsoft.com> | 2017-02-17 23:08:02 +0300 |
|---|---|---|
| committer | Eric Mellino <erme@microsoft.com> | 2017-03-01 03:31:56 +0300 |
| commit | 93c04061b231306546666de03448e3f8d0ed44e2 (patch) | |
| tree | 445cf69c63459b0ea9069bed536661491666ec7b /src/System.Runtime.CompilerServices.Unsafe | |
| parent | 0521745e315bb375192c7581faac72d8faf44627 (diff) | |
Restore ilasm from external directory
* Also, re-enable all of the projects that were disabled because ilasm
didn't work outside Windows.
Diffstat (limited to 'src/System.Runtime.CompilerServices.Unsafe')
4 files changed, 8 insertions, 10 deletions
diff --git a/src/System.Runtime.CompilerServices.Unsafe/src/Configurations.props b/src/System.Runtime.CompilerServices.Unsafe/src/Configurations.props index b27f27df34..f6b9b507b2 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/src/Configurations.props +++ b/src/System.Runtime.CompilerServices.Unsafe/src/Configurations.props @@ -2,9 +2,8 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - <!-- ilproj's cannot be built outside of Windows, https://github.com/dotnet/buildtools/issues/1301 --> - netstandard1.0-Windows_NT; - netstandard-Windows_NT; + netstandard1.0; + netstandard; </BuildConfigurations> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj b/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj index 39874d049d..dfe4d256fe 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj +++ b/src/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj @@ -4,7 +4,7 @@ <PropertyGroup> <DocumentationFile>$(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe.xml</DocumentationFile> <ProjectGuid>{04BA3E3C-6979-4792-B19E-C797AD607F42}</ProjectGuid> - <IlasmFlags>$(IlasmFlags) /INCLUDE=include\$(TargetGroup)</IlasmFlags> + <IlasmFlags>$(IlasmFlags) -INCLUDE=include\$(TargetGroup)</IlasmFlags> <!-- cannot build on unix, but package as OS-agnostic --> <PackageTargetRuntime /> </PropertyGroup> @@ -20,4 +20,4 @@ <CallTarget Targets="$(TargetsTriggeredByCompilation)" Condition="'$(TargetsTriggeredByCompilation)' != ''" /> </Target> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props b/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props index 6cc4dcd0eb..d3ac8a63c7 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/Configurations.props @@ -2,7 +2,7 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netcoreapp-Windows_NT; + netcoreapp; </BuildConfigurations> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj index 0ebfb9797c..9e3fca35e1 100644 --- a/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj +++ b/src/System.Runtime.CompilerServices.Unsafe/tests/System.Runtime.CompilerServices.Unsafe.Tests.csproj @@ -3,7 +3,6 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <UnsupportedPlatforms>Linux;NetBSD;OSX</UnsupportedPlatforms> <ProjectGuid>{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}</ProjectGuid> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" /> @@ -12,4 +11,4 @@ <Compile Include="UnsafeTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project>
\ No newline at end of file +</Project> |