Skip to content

Commit

Permalink
build with 3.0.100 issues dotnet#3
Browse files Browse the repository at this point in the history
  • Loading branch information
akrisiun committed Sep 29, 2019
1 parent cccf24b commit 3aa6ea3
Show file tree
Hide file tree
Showing 2,333 changed files with 38,983 additions and 37,616 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -276,3 +276,6 @@ config.ps1

# VS debug support files
launchSettings.json

*.zip
*.nupkg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions b.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

dotnet msbuild build.proj /t:Restore

# dotnet msbuild src/packages.builds /t:GenerateVersionFileForPackages
# dotnet msbuild src/packages.builds /t:UpdatePackageIndexWithStableVersions
dotnet msbuild build.proj /t:BuildManaged
dotnet msbuild build.proj /t:Build

dotnet msbuild build.proj /t:Pack
1 change: 1 addition & 0 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
</Target>

<Target Name="Pack">
<!-- PermitMissingInbox suppression -->
<ItemGroup>
<_PackProjects Include="src\packages.builds" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<LibBinDir>$(NETCoreAppPackageRuntimePath)</LibBinDir>

<IsFrameworkPackage>true</IsFrameworkPackage>
<SkipValidatePackage>false</SkipValidatePackage>

<!-- Private packages need symbols -->
<IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
Expand All @@ -19,7 +20,8 @@
<IgnoredReference Include="System.Private.CoreLib" />
<IgnoredReference Include="Windows" />

<IgnoredReference Condition="$(PackageTargetRuntime.EndsWith('-aot'))" Include="System.Private.Interop" />
<IgnoredReference Condition="$(PackageTargetRuntime.EndsWith('-aot'))"
Include="System.Private.Interop" />
<!-- Exclude shims from the closure verification -->
<ExcludeFromClosure Include="mscorlib" />
<ExcludeFromClosure Include="System" />
Expand Down Expand Up @@ -57,8 +59,33 @@
<!-- Permit missing Inbox since this used to be a shim and it is now OOB -->
<ValidatePackageSuppression Include="PermitMissingInbox">
<Value>
System.ComponentModel.Composition;
</Value>
System.ComponentModel.Composition;
</Value>
<!--
Microsoft.VisualBasic;
Microsoft.VisualBasic.Core;
mscorlib;
System;
System.ComponentModel.DataAnnotations;
System.Configuration;
System.Core;
System.Data;
System.Drawing;
System.IO.Compression.FileSystem;
System.Net;
System.Numerics;
System.Runtime.Serialization;
System.Security;
System.ServiceModel.Web;
System.ServiceProcess;
System.Transactions;
System.Web;
System.Windows;
System.Xml;
System.Xml.Linq;
System.Xml.Serialization;
WindowsBase;
</Value> -->
</ValidatePackageSuppression>
</ItemGroup>

Expand Down
7 changes: 0 additions & 7 deletions pkg/Microsoft.Private.CoreFx.UAP/Configurations.props

This file was deleted.

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions pkg/Microsoft.Private.CoreFx.UAP/uap.rids.props

This file was deleted.

22 changes: 22 additions & 0 deletions pkg/frameworkPackage.targets
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,28 @@

<!-- Suppress errors caused by removing S.CM.C shim from inbox -->
<SuppressNETStandardMissingFile Include="System.ComponentModel.Composition" />
<!-- !!! -->
<!-- NETCoreApp reference assemblies
~\pkg\frameworkPackage.targets(181,5): error : Files
'mscorlib;System.Data;System;System.Drawing;System.IO.Compression.FileSystem;System.Net;System.Numerics;System.Runtime.Serialization;System.ServiceModel.Web;System.Transactions;System.Web;System.Windows;System.Xml;System.Xml.Linq;System.Xml.Serialization'
are part of 'NETStandard.Library' but missing from this package's reference files. -->
<SuppressNETStandardMissingFile Include="System.Core" />
<SuppressNETStandardMissingFile Include="mscorlib" />
<SuppressNETStandardMissingFile Include="System.Data" />

<SuppressNETStandardMissingFile Include="System" />
<SuppressNETStandardMissingFile Include="System.Drawing" />
<SuppressNETStandardMissingFile Include="System.IO.Compression.FileSystem" />
<SuppressNETStandardMissingFile Include="System.Net" />
<SuppressNETStandardMissingFile Include="System.Numerics" />
<SuppressNETStandardMissingFile Include="System.Runtime.Serialization" />
<SuppressNETStandardMissingFile Include="System.ServiceModel.Web" />
<SuppressNETStandardMissingFile Include="System.Transactions" />
<SuppressNETStandardMissingFile Include="System.Web" />
<SuppressNETStandardMissingFile Include="System.Windows" />
<SuppressNETStandardMissingFile Include="System.Xml" />
<SuppressNETStandardMissingFile Include="System.Xml.Linq" />
<SuppressNETStandardMissingFile Include="System.Xml.Serialization" />

<_NETStandardMissingFile Include="@(_NETStandardFile->'%(FileName)')" Exclude="@(ClosureFile->'%(FileName)')" />
<_NETStandardMissingFileError Include="@(_NETStandardMissingFile)" Exclude="@(SuppressNETStandardMissingFile)" />
Expand Down

This file was deleted.

Loading

0 comments on commit 3aa6ea3

Please sign in to comment.