Skip to content
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

Jump to bottom

Remove some workarounds #1101

Merged
merged 1 commit into from
Jul 31, 2019
Merged

Remove some workarounds #1101

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
Remove some workarounds
  • Loading branch information
@bricelam
bricelam committed Jul 31, 2019
commit d8bdb2dbb100c2708b145f38bd176f7b115cf5ef
5 changes: 0 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,4 @@
<PackageProjectUrl>http://go.microsoft.com/fwlink/?LinkID=263480</PackageProjectUrl>
<DebugType>portable</DebugType>
</PropertyGroup>

<!-- HACK: Work around dotnet/arcade#1373 -->
<PropertyGroup>
<NoWarn>$(NoWarn);NU5125</NoWarn>
</PropertyGroup>
</Project>
5 changes: 0 additions & 5 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<PropertyGroup>
<!-- HACK: Work around dotnet/sdk#2976 in dependencies -->
<BundledNETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
</PropertyGroup>

<ItemGroup>
<!-- HACK: Use the latest version instead of the one bundled with the SDK -->
<KnownFrameworkReference Update="Microsoft.NETCore.App">
Expand Down
4 changes: 0 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>d15a0adeb874801e7bfaa4fbbb306a2efa268497</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview8.19378.8" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>80f411d58df8338ccd9430900b541a037a9cb383</Sha>
Expand Down
1 change: 0 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/corefx">
<MicrosoftCSharpVersion>4.6.0-preview8.19378.8</MicrosoftCSharpVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview8.19378.8</MicrosoftNETCorePlatformsPackageVersion>
<SystemCodeDomVersion>4.6.0-preview8.19378.8</SystemCodeDomVersion>
<SystemComponentModelAnnotationsVersion>4.6.0-preview8.19378.8</SystemComponentModelAnnotationsVersion>
<SystemConfigurationConfigurationManagerVersion>4.6.0-preview8.19378.8</SystemConfigurationConfigurationManagerVersion>
Expand Down