Merge upstream changes
# Conflicts: # eng/Version.Details.xml # eng/Versions.props
This commit is contained in:
Daniel Plaisted
commit
ab6b6aa12c
4 changed files with 22 additions and 78 deletions
|
|
@ -1,17 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-preview.1.20112.8">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="5.0.0-preview.1.20112.9">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>a062f2b859eb5ec4478c6d8d3c2a4d3e3007423d</Sha>
|
||||
<Sha>63801ef66b5c7269acf0bd543350afc8bbb743f2</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.1.20112.8">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App" Version="5.0.0-preview.1.20112.9">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>a062f2b859eb5ec4478c6d8d3c2a4d3e3007423d</Sha>
|
||||
<Sha>63801ef66b5c7269acf0bd543350afc8bbb743f2</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.1.20112.8">
|
||||
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="5.0.0-preview.1.20112.9">
|
||||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>a062f2b859eb5ec4478c6d8d3c2a4d3e3007423d</Sha>
|
||||
<Sha>63801ef66b5c7269acf0bd543350afc8bbb743f2</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.1.20112.8">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
@ -84,13 +84,13 @@
|
|||
<Sha>adda770782d4fe6ad57a2b4f5e117aa4bdb7a8a9</Sha>
|
||||
</Dependency>
|
||||
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.1.20111.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.1.20112.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/winforms</Uri>
|
||||
<Sha>e32620ed185e3c15fa67bdb7fe93757a735d6edb</Sha>
|
||||
<Sha>a5a8ea0d871597c9902e9a9af7f02ad29c3af87e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.1.20112.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="5.0.0-preview.1.20112.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>f85104f302023269585a0fd6a89d2e7e7ea386d4</Sha>
|
||||
<Sha>e87030de71023db0b7973560fa8dd175fc1dbab6</Sha>
|
||||
</Dependency>
|
||||
<!-- This is so that WCF packages are included in the final drop for official releases. -->
|
||||
<!-- Replace with better solution, see https://github.com/dotnet/arcade/issues/4162 -->
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-preview.1.20111.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-preview.1.20112.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/wpf -->
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.1.20112.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>5.0.0-preview.1.20112.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
|
|
@ -75,9 +75,9 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.1.20112.8</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.1.20112.8</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.1.20112.8</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppPackageVersion>5.0.0-preview.1.20112.9</MicrosoftWindowsDesktopAppPackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>5.0.0-preview.1.20112.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftWindowsDesktopAppRefPackageVersion>5.0.0-preview.1.20112.9</MicrosoftWindowsDesktopAppRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
|
||||
|
|
|
|||
|
|
@ -24,9 +24,10 @@ phases:
|
|||
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
|
||||
${{ if eq(parameters.agentOs, 'Windows_NT') }}:
|
||||
enableMicrobuild: true
|
||||
enablePublishBuildArtifacts: true
|
||||
enablePublishBuildAssets: true
|
||||
enablePublishTestResults: true
|
||||
# Don't use built-in arcade logic for publishing artifacts and test results, as we manually do this and give better names
|
||||
#enablePublishBuildArtifacts: true
|
||||
#enablePublishTestResults: true
|
||||
enablePublishUsingPipelines: ${{parameters.enablePublishUsingPipelines}}
|
||||
enableTelemetry: true
|
||||
helixRepo: dotnet/core-sdk
|
||||
|
|
|
|||
|
|
@ -45,27 +45,6 @@
|
|||
</TestList>
|
||||
|
||||
<SkippedTests>
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp.It_does_not_rewrite_the_single_file_unnecessarily"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/10602#pullrequestreview-353377225"
|
||||
Reason="Waiting for code flow"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_defaults_keep_nonframework"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/10602#pullrequestreview-353377225"
|
||||
Reason="Waiting for code flow"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_displays_informational_warning"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/10602#pullrequestreview-353377225"
|
||||
Reason="Waiting for code flow"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink.ILLink_runs_incrementally"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/10602#pullrequestreview-353377225"
|
||||
Reason="Waiting for code flow"/>
|
||||
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToUseVB.It_builds_a_vb_wpf_app"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/wpf/issues/1734"
|
||||
|
|
@ -76,46 +55,10 @@
|
|||
Issue="https://github.com/dotnet/sdk/pull/3574"
|
||||
Reason="Test update needed (in PR)"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.RuntimeFrameworkVersionCanBeSpecifiedOnFrameworkReference"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3221"
|
||||
Reason="Code flow needed"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TargetingPackVersionCanBeSpecifiedOnFrameworkReference"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3221"
|
||||
Reason="Code flow needed"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TargetLatestPatchCanBeSpecifiedOnFrameworkReference"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3221"
|
||||
Reason="Code flow needed"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromPackageReference"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3221"
|
||||
Reason="Code flow needed"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromProjectReference"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3221"
|
||||
Reason="Code flow needed"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToResolveConflicts.AProjectCanReferenceADllInAPackageDirectly"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3214"
|
||||
Reason="Code flow needed"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPreserveCompilationContext.It_publishes_the_project_with_a_refs_folder_and_correct_deps_file"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/sdk/pull/3237"
|
||||
Reason="Code flow needed"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_targets_the_right_framework_depending_on_output_type"
|
||||
<!-- <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_targets_the_right_framework_depending_on_output_type"
|
||||
Skip="true"
|
||||
Issue=""
|
||||
Reason="Test needs to be updated with new patches (along with SDK stage 0 update)"/>
|
||||
|
||||
Reason="Test needs to be updated with new patches (along with SDK stage 0 update)"/> -->
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_RID_specific_runnable_output"
|
||||
Skip="true"
|
||||
|
|
@ -167,7 +110,7 @@
|
|||
Issue=""
|
||||
Reason="Needs .NET Core 1.1"/>
|
||||
|
||||
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildADesktopExeWithFSharp.It_builds_a_simple_desktop_app"
|
||||
<!-- <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildADesktopExeWithFSharp.It_builds_a_simple_desktop_app"
|
||||
Skip="true"
|
||||
Issue="https://github.com/dotnet/coreclr/issues/27275"
|
||||
Reason="F# compiler is failing on .NET 5 runtime"
|
||||
|
|
@ -177,7 +120,7 @@
|
|||
Skip="true"
|
||||
Issue="https://github.com/dotnet/coreclr/issues/27275"
|
||||
Reason="F# compiler is failing on .NET 5 runtime"
|
||||
/>
|
||||
/> -->
|
||||
|
||||
<Method Name="Microsoft.NET.Publish.Tests.PublishWpfApp.It_publishes_and_runs_self_contained_wpf_app"
|
||||
Skip="true"
|
||||
|
|
|
|||
Loading…
Reference in a new issue