diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2008e5aa687..bb7a6536337 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,69 +1,69 @@ - - https://github.com/dotnet/core-setup - 25abcf43fe1da7a8bdad3d5053ebc01dc80ea450 - - + https://github.com/dotnet/winforms - fd52f87e309d708ce4491f7c65b892f29091346f + f977a22b418447e1a42d04a61ab29c289465146f - + + + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 - - - + + https://github.com/dotnet/core-setup + 4d6087136f8af1c076f706f59441f6de9795980b + + https://github.com/dotnet/arcade 46718d98c0fd03690a6a8c83da692a4a85a17902 @@ -71,9 +71,9 @@ https://github.com/dotnet/arcade 46718d98c0fd03690a6a8c83da692a4a85a17902 - + https://github.com/dotnet/corefx - 1f9b84a0804e868c7e0f37a3c10fbaf7c735ae14 + 82eedbff6b767c0bd9297d3dd27c89d925a28e93 diff --git a/eng/Versions.props b/eng/Versions.props index a12ac1589ec..c3187ce022b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,29 +7,29 @@ - 4.8.0-preview5.19208.4 + 4.8.0-preview5.19218.1 - 3.0.0-preview5-27618-02 - 3.0.0-preview5.19217.12 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 + 3.0.0-preview5-27618-06 + 3.0.0-preview5.19218.1 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 4.6.0-preview4.19176.11 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 - 4.6.0-preview5.19217.12 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 + 4.6.0-preview5.19218.1 diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props index 8f7eb9ccecb..43eb0affa6a 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props @@ -1,6 +1,6 @@ - $(MicrosoftNETCoreAppVersion) + $(MicrosoftNETCoreAppVersion) diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets index f21b197d136..065527bdd93 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets @@ -6,14 +6,20 @@ + Condition="'$(MSBuildProjectExtension)'!='.vcxproj' And '$(WpfTest)'!='true'"/> + + Condition="'$(ManagedCxx)'=='true' And '$(WpfTest)'!='true'"/> + + + $(MicrosoftNETCoreAppVersion) + - +