提交 13dcafdc 编写于 作者: E Eric StJohn 提交者: GitHub

Fix package validation issues (dotnet/corefx#33782)



Commit migrated from https://github.com/dotnet/corefx/commit/c0c16a32abff07944f38771f64c6ada398adadc9
上级 2ef74f6b
......@@ -51,12 +51,11 @@
<PackageFile Include=".\build\net45\System.Runtime.WindowsRuntime.UI.Xaml.targets">
<TargetPath>\build\net45\</TargetPath>
</PackageFile>
<PackageFile Include=".\build\net451\System.Runtime.WindowsRuntime.UI.Xaml.targets">
<TargetPath>\build\net451\</TargetPath>
</PackageFile>
<PackageFile Include=".\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets">
<TargetPath>\build\net461\</TargetPath>
</PackageFile>
<!-- We need to manually ref S.R.WinRT since it is treated as inbox, but requires a package for reference -->
<ProjectReference Include="..\..\System.Runtime.WindowsRuntime\pkg\System.Runtime.WindowsRuntime.pkgproj" TargetFramework="net45" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
......
......@@ -10,7 +10,7 @@
<_HasReferenceToSystemRuntime>true</_HasReferenceToSystemRuntime>
</PropertyGroup>
<ItemGroup>
<ReferencePath Include="$(MSBuildThisFileDirectory)..\..\ref\netstandard1.0\System.Runtime.WindowsRuntime.UI.Xaml.dll">
<ReferencePath Include="$(MSBuildThisFileDirectory)..\..\ref\netstandard1.1\System.Runtime.WindowsRuntime.UI.Xaml.dll">
<!-- Private = false to make these reference only -->
<Private>false</Private>
<!-- given this package does not have NugetPackage metadata it will not show in solution explorer, making it explicit -->
......
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Choose>
<When Condition="'$(DoNotReferenceWinRT)' != 'true'">
<!--
ResolveAssemblyReference was attempting to write binding redirects
for these assemblies (even though they are in the unification list).
-->
<PropertyGroup>
<!-- ...include the reference to System.Runtime -->
<_HasReferenceToSystemRuntime>true</_HasReferenceToSystemRuntime>
</PropertyGroup>
<ItemGroup>
<ReferencePath Include="$(MSBuildThisFileDirectory)..\..\ref\netstandard1.2\System.Runtime.WindowsRuntime.UI.Xaml.dll">
<!-- Private = false to make these reference only -->
<Private>false</Private>
<!-- given this package does not have NugetPackage metadata it will not show in solution explorer, making it explicit -->
<Visible>false</Visible>
</ReferencePath>
</ItemGroup>
</When>
</Choose>
</Project>
......@@ -11,10 +11,12 @@
<ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net" />
<Reference Include="System.Security" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Transactions" />
</ItemGroup>
......
......@@ -3142,7 +3142,7 @@
"4.0.0",
"4.3.0"
],
"BaselineVersion": "4.3.0",
"BaselineVersion": "4.6.0",
"InboxOn": {
"uap10.0.16299": "4.0.4.0"
},
......@@ -4171,7 +4171,7 @@
"4.0.11",
"4.3.0"
],
"BaselineVersion": "4.3.0",
"BaselineVersion": "4.6.0",
"InboxOn": {
"net45": "4.0.0.0",
"net451": "4.0.10.0",
......
......@@ -17,6 +17,9 @@
<IgnoredTypes Include="XamlGeneratedNamespace.GeneratedInternalTypeHelper" />
<IgnoredTypes Include="System.Deployment.Internal.CodeSigning.RSAPKCS1SHA256SignatureDescription" />
<IgnoredTypes Include="System.ServiceModel.Channels.HttpRequestMessageExtensionMethods" />
<!-- windows.winmd is not part of the framework -->
<IgnoredReference Include="Windows" />
</ItemGroup>
<!-- this target must run before ResolveLockFileReferences so
......
......@@ -11,5 +11,8 @@
<!-- intentionally dangling refs in shims -->
<ExcludeFromClosure Include="@(NetFxReference)" />
<IgnoredReference Include="@(NetFxReference)" />
<!-- windows.winmd is not part of the framework -->
<IgnoredReference Include="Windows" />
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -185,9 +185,7 @@
<Target Name="BuildProjects"
DependsOnTargets="RestoreProjects">
<Message Importance="High" Text="*** Testing ***" />
<Exec Command="$(TestBuildCommand) &quot;$(TestProject)&quot; /p:TestPackages=%(SupportedPackage.Identity)" EnvironmentVariables="@(CliEnvironment)" ContinueOnError="ErrorAndContinue" StandardOutputImportance="High" />
<Error Condition="'$(MSBuildLastTaskResult)' == 'false'" Text="There were errors when building the test package projects." />
<Exec Command="$(TestBuildCommand) &quot;$(TestProject)&quot; /p:TestPackages=%(SupportedPackage.Identity)" EnvironmentVariables="@(CliEnvironment)" StandardOutputImportance="High" />
</Target>
<Target Name="Build" DependsOnTargets="BuildProjects" />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册