diff --git a/NuGet.config b/NuGet.config index c0346aafa45..b3c69e7ae99 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2746d859a53..50b5c0be323 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,111 +1,111 @@ - - - - - https://github.com/dotnet/winforms - 9b0ec7bb6e82818a4ac80702a9cd5c45f5d2ffde - - - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/core-setup - e1d780539e85f4d8de263957715f9d08db2ceef4 - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 914f5f71a797720a04c0808e4dd3e50b1fb2f4b6 - - - https://github.com/dotnet/corefx - 468355e66daf9eaeb1978703fa6365cd1e37e644 - - - https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b - - - https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b - - - https://github.com/dotnet/coreclr - 8974a699899bdc2cc5687504e1ada606ac803e9b - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - https://github.com/dotnet/arcade - 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f - - - + + + + + https://github.com/dotnet/winforms + 9b0ec7bb6e82818a4ac80702a9cd5c45f5d2ffde + + + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/core-setup + e1d780539e85f4d8de263957715f9d08db2ceef4 + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int + 95335bdc0bbae81d9a378fe5a4b13c831d5a27c3 + + + https://github.com/dotnet/corefx + 468355e66daf9eaeb1978703fa6365cd1e37e644 + + + https://github.com/dotnet/coreclr + 8974a699899bdc2cc5687504e1ada606ac803e9b + + + https://github.com/dotnet/coreclr + 8974a699899bdc2cc5687504e1ada606ac803e9b + + + https://github.com/dotnet/coreclr + 8974a699899bdc2cc5687504e1ada606ac803e9b + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + https://github.com/dotnet/arcade + 4b3d46cc75969c4e2de5786ec2b10a430b26dd9f + + + diff --git a/eng/Versions.props b/eng/Versions.props index 4a15a6d0777..60aa4077c89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,112 +1,112 @@ - - - - 4.8.0 - preview8 - 4.0.0.0 - 4.6.0-preview7.19320.1 - - - - 4.8.0-preview7.19325.3 - - - - 3.0.0-preview7.19323.2 - 3.0.0-preview7.19323.2 - 3.0.0-preview7.19323.2 - - - - 3.0.0-preview7-27824-03 - 3.0.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - - - - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview4.19176.11 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - 4.6.0-preview7.19320.1 - - - - 1.0.0-beta.19326.2 - 1.0.0-beta.19326.2 - 1.0.0-beta.19326.2 - - - - 0.1.0-preview2-181205-2 - - - - 4.4.0 - - - - 15.9.20 - 15.9.20 - 2.4.0 - $(XUnitVersion) - $(XUnitVersion) - - 1.0.0-beta.19263.1 - - 5.28.1.1-1 - 0.0.0.1 - - - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json; - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - - - - - System.Reflection.MetadataLoadContext - Microsoft.Private.Winforms - System.Drawing.Common - System.DirectoryServices - Microsoft.DotNet.Wpf.DncEng - System.IO.Packaging - System.Reflection.MetadataLoadContext - - - - 4.8.0-preview7.19325.4 - - + + + + 4.8.0 + preview8 + 4.0.0.0 + 4.6.0-preview7.19320.1 + + + + 4.8.0-preview7.19325.3 + + + + 3.0.0-preview7.19323.2 + 3.0.0-preview7.19323.2 + 3.0.0-preview7.19323.2 + + + + 3.0.0-preview7-27824-03 + 3.0.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + + + + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview4.19176.11 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + 4.6.0-preview7.19320.1 + + + + 1.0.0-beta.19326.2 + 1.0.0-beta.19326.2 + 1.0.0-beta.19326.2 + + + + 0.1.0-preview2-181205-2 + + + + 4.4.0 + + + + 15.9.20 + 15.9.20 + 2.4.0 + $(XUnitVersion) + $(XUnitVersion) + + 1.0.0-beta.19263.1 + + 5.28.1.1-1 + 0.0.0.1 + + + + $(RestoreSources); + https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json; + https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json; + https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json; + https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; + + + + + System.Reflection.MetadataLoadContext + Microsoft.Private.Winforms + System.Drawing.Common + System.DirectoryServices + Microsoft.DotNet.Wpf.DncEng + System.IO.Packaging + System.Reflection.MetadataLoadContext + + + + 4.8.0-preview8.19326.19 + + diff --git a/global.json b/global.json index 12a08128837..61df4b7e1f8 100644 --- a/global.json +++ b/global.json @@ -1,24 +1,24 @@ -{ - "tools": { - "dotnet": "3.0.100-preview7-012512", - "runtimes": { - "dotnet": [ - "2.1.7", - "$(MicrosoftNETCoreAppVersion)" - ] - }, - "vs": { - "version": "16.1" - } - }, - "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19326.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19326.2" - }, - "native-tools": { - "strawberry-perl": "5.28.1.1-1", - "net-framework-48-ref-assemblies": "0.0.0.1", - "dotnet-api-docs_netcoreapp3.0": "0.0.0.1", - "msvcurt-c1xx": "0.0.0.4" - } -} +{ + "tools": { + "dotnet": "3.0.100-preview7-012512", + "runtimes": { + "dotnet": [ + "2.1.7", + "$(MicrosoftNETCoreAppVersion)" + ] + }, + "vs": { + "version": "16.1" + } + }, + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19326.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19326.2" + }, + "native-tools": { + "strawberry-perl": "5.28.1.1-1", + "net-framework-48-ref-assemblies": "0.0.0.1", + "dotnet-api-docs_netcoreapp3.0": "0.0.0.1", + "msvcurt-c1xx": "0.0.0.4" + } +}