Merge pull request #15765 from weshaggard/UpdateNS2Baseline

Update NS2.0 Apicompat baseline
dotnet · Feb 3, 2017 · 8c96c4e · 8c96c4e
2 parents caf01f7 + d902b1c
commit 8c96c4e
Show file tree

Hide file tree

Showing 10 changed files with 1,001 additions and 8,894 deletions.
diff --git a/dependencies.props b/dependencies.props
@@ -30,7 +30,7 @@
     <CoreClrExpectedPrerelease>beta-25003-02</CoreClrExpectedPrerelease>
     <ExternalExpectedPrerelease>beta-25002-00</ExternalExpectedPrerelease>
     <ProjectNTfsExpectedPrerelease>beta-25003-00</ProjectNTfsExpectedPrerelease>
-    <StandardExpectedPrerelease>beta-24928-01</StandardExpectedPrerelease>
+    <StandardExpectedPrerelease>beta-25003-02</StandardExpectedPrerelease>
     <!-- Use the SNI runtime package -->
     <SniPackageVersion>4.4.0-beta-24926-02</SniPackageVersion>
   </PropertyGroup>

diff --git a/external/netstandard/project.json.template b/external/netstandard/project.json.template
@@ -2,7 +2,7 @@
   "frameworks": {
     "{TFM}": {
       "dependencies": {
-        "NETStandard.Library": "2.0.0-beta-24928-01"
+        "NETStandard.Library": "2.0.0-beta-25003-02"
       }
     }
   }

diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
@@ -84,14 +84,9 @@
     <ItemGroup>
       <!-- Exclude shims from the closure verification -->
       <ExcludeFromClosure Include="mscorlib" />
-      <ExcludeFromClosure Include="System.Core" />
       <ExcludeFromClosure Include="System" />
-      <ExcludeFromClosure Include="System.Drawing" />
-      <ExcludeFromClosure Include="System.Numerics" />
-      <ExcludeFromClosure Include="System.Runtime.Serialization" />
-      <ExcludeFromClosure Include="System.Web" />
-      <ExcludeFromClosure Include="System.Xml" />
-      <ExcludeFromClosure Include="System.Xml.Linq" />
+      <ExcludeFromClosure Include="System.Core" />
+      <ExcludeFromClosure Include="System.Data" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/shims/ApiCompatBaseline.netcoreapp.netfx461.txt b/src/shims/ApiCompatBaseline.netcoreapp.netfx461.txt
diff --git a/src/shims/ApiCompatBaseline.netcoreapp.netstandard20.txt b/src/shims/ApiCompatBaseline.netcoreapp.netstandard20.txt
diff --git a/src/shims/ApiCompatBaseline.uap.netfx461.txt b/src/shims/ApiCompatBaseline.uap.netfx461.txt
diff --git a/src/shims/ApiCompatBaseline.uap.netstandard20.txt b/src/shims/ApiCompatBaseline.uap.netstandard20.txt
diff --git a/src/shims/ApiCompatBaseline.uapaot.netfx461.txt b/src/shims/ApiCompatBaseline.uapaot.netfx461.txt
diff --git a/src/shims/ApiCompatBaseline.uapaot.netstandard20.txt b/src/shims/ApiCompatBaseline.uapaot.netstandard20.txt
diff --git a/src/shims/shims.proj b/src/shims/shims.proj
@@ -18,7 +18,10 @@
     <NetFxReference Include="mscorlib" />
     <NetFxReference Include="System" />
     <NetFxReference Include="System.Core" />
+    <NetFxReference Include="System.ComponentModel.Composition" />
+    <NetFxReference Include="System.Data" />
     <NetFxReference Include="System.Drawing" />
+    <NetFxReference Include="System.IO.Compression.FileSystem" />
     <NetFxReference Include="System.Numerics" />
     <NetFxReference Include="System.Runtime.Serialization" />
     <NetFxReference Include="System.Web" />
@@ -107,7 +110,7 @@
     <MakeDir Directories="$(IntermediateOutputPath)" />
     <WriteLinesToFile File="$(ApiCompatResponseFile)" Lines="$(ApiCompatArgs)" Overwrite="true" />
 
-    <Exec Command="$(ApiCompatCmd) &quot;$(NetFxRefPath)&quot; @&quot;$(ApiCompatResponseFile)&quot; &gt; $(ApiCompatBaselineFile)"
+    <Exec Command="$(ApiCompatCmd) &quot;@(NetFxContracts)&quot; @&quot;$(ApiCompatResponseFile)&quot; &gt; $(ApiCompatBaselineFile)"
           CustomErrorRegularExpression="^[a-zA-Z]+ :"
           StandardOutputImportance="Low"
           IgnoreExitCode="true"