diff --git a/Build.proj b/Build.proj index a48178274..3e40bdb2f 100644 --- a/Build.proj +++ b/Build.proj @@ -1,5 +1,9 @@ + + $(NetCurrent) + + @@ -8,7 +12,17 @@ + + + + + + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f5ede309d..7b1558aac 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,48 +6,48 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-beta.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 - 10.0.0-rc.2.25427.104 + 10.0.0-beta.25457.102 + 10.0.0-beta.25457.102 + 10.0.0-beta.25457.102 + 10.0.0-beta.25457.102 + 10.0.0-beta.25457.102 + 10.0.0-beta.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 + 10.0.0-rc.2.25457.102 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9c99aac1..04a21ea7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,176 +1,176 @@ - + - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 8ea69c337be69385ff7eb44b2a54db78010110d8 diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 0c92f81d7..3270f83fa 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -10,7 +10,7 @@ show_usage() { echo "Advanced settings:" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" - echo " --noWarnAsError Do not warn as error + echo " --noWarnAsError Do not warn as error" echo "" echo "Command line arguments not listed above are passed thru to msbuild." } diff --git a/global.json b/global.json index 13ce1ad71..bb72e2d81 100644 --- a/global.json +++ b/global.json @@ -18,8 +18,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25427.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25457.102", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25457.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } diff --git a/src/windowsdesktop/src/Microsoft.WindowsDesktop.App.Ref.stub.proj b/src/windowsdesktop/src/Microsoft.WindowsDesktop.App.Ref.stub.proj new file mode 100644 index 000000000..41c69d69a --- /dev/null +++ b/src/windowsdesktop/src/Microsoft.WindowsDesktop.App.Ref.stub.proj @@ -0,0 +1,13 @@ + + + + + Microsoft.WindowsDesktop.App.Ref + true + true + false + + +