Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Manual darc update for arcade and coreclr #34977

Merged
stephentoub merged 4 commits into from
Jan 31, 2019
Merged

Manual darc update for arcade and coreclr #34977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd47112
Remove target to print MCUrl now that helix sdk always prints it
safern Jan 31, 2019
651a50e
Run darc update for dotnet/arcade
safern Jan 31, 2019
c50049c
Run darc update for dotnet\coreclr
safern Jan 31, 2019
c8c5a7c
Fix build after Environment pushed down to coreclr
safern Jan 31, 2019
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
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,69 +14,69 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>988132f2a89decd7203d665d26df53bc1c8f9eec</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview-27330-71">
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-preview-27330-72">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>81e12aaff1d8671f1e7709afa3183458eaa79673</Sha>
<Sha>1b43bd8139d053e24ec51c193054555e3352371a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview-27330-71">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview-27330-72">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>81e12aaff1d8671f1e7709afa3183458eaa79673</Sha>
<Sha>1b43bd8139d053e24ec51c193054555e3352371a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview-27330-71">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview-27330-72">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>81e12aaff1d8671f1e7709afa3183458eaa79673</Sha>
<Sha>1b43bd8139d053e24ec51c193054555e3352371a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19074.3">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>59e16d29c96343a15d818cd4eed57a348937ddfd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SourceRewriter" Version="1.0.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.SourceRewriter" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19079.3">
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f1cfa4893337c329834c42c997b1e3d8a05f9d6a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19079.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>268dc10408d39b6059924989a071549371757fb1</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19078.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19080.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0d74e7a3e7c5959cbebe7302a8bf2aba98da6a4a</Sha>
<Sha>14d1133b6074b463784a7adbbf385df0462f4010</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19078.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetSourceRewriterPackageVersion>1.0.0-beta.19078.1</MicrosoftDotNetSourceRewriterPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19078.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19078.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19078.1</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19078.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19078.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19079.3</MicrosoftDotNetCoreFxTestingPackageVersion>
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19079.6</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19078.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19080.6</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetSourceRewriterPackageVersion>1.0.0-beta.19080.6</MicrosoftDotNetSourceRewriterPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19080.6</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19080.6</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19080.6</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19080.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19080.6</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19080.6</MicrosoftDotNetCoreFxTestingPackageVersion>
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19080.6</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19080.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<!-- Core-setup dependencies -->
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27329-4</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview-27329-4</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview-27329-4</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<!-- Coreclr dependencies -->
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview-27330-71</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27330-71</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview-27330-72</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27330-72</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<!-- Standard dependencies -->
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19074.3</NETStandardLibraryPackageVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates/steps/send-to-helix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ parameters:
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false

steps:
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
- powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
displayName: Send job to Helix (Windows)
env:
BuildConfig: $(_BuildConfig)
Expand All @@ -52,7 +52,7 @@ steps:
Creator: ${{ parameters.Creator }}
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }}
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
- script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
displayName: Send job to Helix (Unix)
env:
BuildConfig: $(_BuildConfig)
Expand Down
13 changes: 0 additions & 13 deletions eng/sendtohelix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,4 @@
</HelixWorkItem>
</ItemGroup>
</Target>

<Target Name="ShowMissionControlUrl"
AfterTargets="StartTestRuns"
Condition="'$(OfficialBuildId)' != ''">
<PropertyGroup>
<_McUser>dotnet-mc-bot-2</_McUser>
<_McHelixType>$([System.String]::Copy('$(HelixType)').ToLowerInvariant().Replace('/', '~2F'))</_McHelixType>
<_McHelixSource>$([System.String]::Copy('$(HelixSource)').ToLowerInvariant().Replace('/', '~2F'))</_McHelixSource>
<_McUrl>https://mc.dot.net/#/user/$(_McUser)/$(_McHelixSource)/$(_McHelixType)/$(OfficialBuildId)</_McUrl>
</PropertyGroup>

<Message Importance="High" Text="Results will be available at $(_McUrl)" />
</Target>
</Project>
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"dotnet": "2.1.401"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19078.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19078.1",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27330-71"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19080.6",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19080.6",
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27330-72"
}
}
1 change: 1 addition & 0 deletions src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
<DefaultReferenceExclusions Include="System.Diagnostics.Debug" />
<DefaultReferenceExclusions Include="System.Runtime.Extensions" />
<ReferenceFromRuntime Include="System.Private.CoreLib" />
<ReferenceFromRuntime Include="System.Runtime" />
<ReferenceFromRuntime Include="System.Threading" />
Expand Down
30 changes: 17 additions & 13 deletions src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,8 @@
<Compile Include="System\CodeDom\Compiler\IndentedTextWriter.cs" />
<Compile Include="System\Context.cs" />
<Compile Include="System\Diagnostics\Stopwatch.cs" />
<Compile Include="System\Environment.cs" />
<Compile Include="System\Environment.SpecialFolder.cs" />
<Compile Include="System\Environment.SpecialFolderOption.cs" />
<Compile Include="System\LoaderOptimization.cs" />
<Compile Include="System\LoaderOptimizationAttribute.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\OperatingSystem.cs">
<Link>Common\CoreLib\System\OperatingSystem.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\CoreLib\System\PlatformID.cs">
<Link>Common\CoreLib\System\PlatformID.cs</Link>
</Compile>
<Compile Include="System\IO\StringReader.cs" />
<Compile Include="System\IO\StringWriter.cs" />
<Compile Include="System\IO\BufferedStream.cs" />
Expand Down Expand Up @@ -72,14 +63,29 @@
<Link>CoreLib\System\Text\ValueStringBuilder.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'uapaot' or '$(TargetGroup)' == 'uap'">
<ItemGroup Condition="'$(TargetsAOT)' == 'true'">
<Compile Include="System\Environment.cs" />
<Compile Include="System\Environment.SpecialFolder.cs" />
<Compile Include="System\Environment.SpecialFolderOption.cs" />
<Compile Condition="'$(TargetsWindows)' == 'true'" Include="System\Environment.Windows.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\OperatingSystem.cs">
<Link>Common\CoreLib\System\OperatingSystem.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\CoreLib\System\PlatformID.cs">
<Link>Common\CoreLib\System\PlatformID.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreappaot'">
<Compile Condition="'$(TargetsWindows)' == 'true'" Include="System\Environment.Win32.cs" />
<Compile Condition="'$(TargetsUnix)' == 'true'" Include="System\Environment.Unix.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
<Compile Include="System\Environment.WinRT.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\WinRTFolderPaths.cs">
<Link>Common\CoreLib\System\WinRTFolderPaths.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(TargetGroup)' != 'uapaot' and '$(TargetGroup)' != 'uap'">
<Compile Include="System\Environment.Win32.cs" />
<Compile Include="$(CommonPath)\CoreLib\Interop\Windows\secur32\Interop.GetUserNameExW.cs">
<Link>Common\Interop\Windows\secur32\Interop.GetUserNameExW.cs</Link>
</Compile>
Expand All @@ -92,7 +98,6 @@
<Compile Include="$(CommonPath)\CoreLib\System\PasteArguments.Windows.cs">
<Link>Common\CoreLib\System\PasteArguments.Windows.cs</Link>
</Compile>
<Compile Include="System\Environment.Windows.cs" />
<Compile Include="System\Runtime\Versioning\VersioningHelper.Windows.cs" />
<Compile Include="System\Diagnostics\Stopwatch.Windows.cs" />
<Compile Include="$(CommonPath)\CoreLib\System\IO\Win32Marshal.cs">
Expand Down Expand Up @@ -179,7 +184,6 @@
</ItemGroup>
<!-- UNIX -->
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
<Compile Include="System\Environment.Unix.cs" />
<Compile Include="System\Runtime\Versioning\VersioningHelper.Unix.cs" />
<Compile Include="System\Diagnostics\Stopwatch.Unix.cs" />
<Compile Include="$(CommonPath)\Interop\OSX\Interop.Libraries.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<NoWarn>$(NoWarn);1698;0436</NoWarn>
<ProjectGuid>{844A2A0B-4169-49C3-B367-AFDC4894E487}</ProjectGuid>
<Configurations>netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard1.0-Debug;netstandard1.0-Release;netstandard1.2-Debug;netstandard1.2-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
<DefineConstants>$(DefineConstants);SYSTEM_RUNTIME_WINDOWSRUNTIME_ASSEMBLY</DefineConstants>
<DefineConstants Condition="'$(TargetGroup)' == 'uapaot'">$(DefineConstants);SYSTEM_RUNTIME_WINDOWSRUNTIME_ASSEMBLY</DefineConstants>
Copy link
Copy Markdown
Member

@stephentoub stephentoub Jan 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change this?

Copy link
Copy Markdown
Member Author

@safern safern Jan 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because for netcoreapp we can’t use Environment from System.Runtime.Extensions since it conflicts because it is now a typeforward, and since this project has a reference from runtime to System.Private.Corelib, it conflicts with the new Environment type exposed there, so we can’t use the alias for it.

However since the type for the version we have in corefx of ProjectN is internal in corelib, we need to resolve this type from System.Runtime.Extensions until we get a new ProjectN with the PR you just merged. We don’t use this constant anywhere else, right?

Copy link
Copy Markdown
Member

@ericstj ericstj Jan 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, the compiler didn't like resolving the typeforward through the alias? Seems like a that might be a compiler bug.

Copy link
Copy Markdown
Member

@stephentoub stephentoub Jan 31, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don’t use this constant anywhere else, right?

Right. Ok. My plan was to remove it entirely once everything flowed through the system.

Copy link
Copy Markdown
Member

@ericstj ericstj Jan 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not related to this commit, but this project warrants some comments as to why it does such weird things. It's not a partial facade yet it's compiling against private surface area from System.Private.CoreLib which is why its using project references and aliases. It'd be really nice if that could be cleaned up. /cc @jeffschwMSFT

</PropertyGroup>
<PropertyGroup Condition="'$(TargetGroup)'=='netcoreapp' or '$(TargetGroup)'=='uap'">
<DefineConstants>$(DefineConstants);netstandard;FEATURE_APPX</DefineConstants>
Expand Down