From 4b7dd8edfb6f0eea3db53abcccb66b7e1911197f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Sep 2019 23:29:22 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/core-setup build 20190904.13 - Microsoft.NETCore.App - 3.1.0-preview1.19454.13 - NETStandard.Library.Ref - 2.1.0-preview1.19454.13 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19454.13 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea444aff6..9c4d1806b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 46108b6c1aad209a359a4a3d28e1a3b214f33e4b - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 46108b6c1aad209a359a4a3d28e1a3b214f33e4b - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 46108b6c1aad209a359a4a3d28e1a3b214f33e4b https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index df7300974..26f16c841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19420-08 + 3.1.0-preview1.19454.13 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19420-08 + 2.1.0-preview1.19454.13 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19420-08 + 3.1.0-preview1.19454.13 $(MicrosoftWindowsDesktopAppPackageVersion) From 6e26d4bb198e467e4463d52b0effbf688a7ea987 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Sep 2019 01:23:44 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/core-setup build 20190904.16 - Microsoft.NETCore.App - 3.1.0-preview1.19454.16 - NETStandard.Library.Ref - 2.1.0-preview1.19454.16 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19454.16 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c4d1806b..3ec90b2c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 46108b6c1aad209a359a4a3d28e1a3b214f33e4b + 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 - + https://github.com/dotnet/core-setup - 46108b6c1aad209a359a4a3d28e1a3b214f33e4b + 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 - + https://github.com/dotnet/core-setup - 46108b6c1aad209a359a4a3d28e1a3b214f33e4b + 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 26f16c841..07ab80ac6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19454.13 + 3.1.0-preview1.19454.16 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19454.13 + 2.1.0-preview1.19454.16 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19454.13 + 3.1.0-preview1.19454.16 $(MicrosoftWindowsDesktopAppPackageVersion) From 245ef6dcfab2c1967efade11afee55eeebd31029 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Sep 2019 21:30:29 +0000 Subject: [PATCH 03/14] Update dependencies from https://github.com/dotnet/core-setup build 20190905.15 - Microsoft.NETCore.App - 3.1.0-preview1.19455.15 - NETStandard.Library.Ref - 2.1.0-preview1.19455.15 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19455.15 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ec90b2c7..56b77ea96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 + 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 - + https://github.com/dotnet/core-setup - 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 + 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 - + https://github.com/dotnet/core-setup - 93e1324ce55c1bbd01206eff6bd659bdf34f8fe1 + 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 71744d3163293fc31cd1c1917929cf172d22bcaa - + https://github.com/dotnet/winforms - 8b19141d6b0b221167bd7d1731cbc6aa9898da75 + dd6650900f5af7283c6af6ec85de4d8d51f28961 - + https://github.com/dotnet/wpf - 105b673bddd8665580a94878db12ac97af8fa794 + ffc3fbd836fb6ff3c28e50fec67be5b55c8b6542 diff --git a/eng/Versions.props b/eng/Versions.props index 07ab80ac6..3f8ad32e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19415.10 + 4.8.0-preview9.19417.1 - 3.0.0-preview9.19416.2 + 3.0.0-preview9.19417.4 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19454.16 + 3.1.0-preview1.19455.15 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19454.16 + 2.1.0-preview1.19455.15 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19454.16 + 3.1.0-preview1.19455.15 $(MicrosoftWindowsDesktopAppPackageVersion) From 209114cb1ead081d2cb4e0cf8c5728594ca95266 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Sep 2019 21:45:47 +0000 Subject: [PATCH 04/14] Update dependencies from https://github.com/dotnet/core-setup build 20190905.16 - Microsoft.NETCore.App - 3.1.0-preview1.19455.16 - NETStandard.Library.Ref - 2.1.0-preview1.19455.16 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19455.16 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56b77ea96..f11c02370 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,15 +2,15 @@ - + https://github.com/dotnet/core-setup 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 - + https://github.com/dotnet/core-setup 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 - + https://github.com/dotnet/core-setup 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 diff --git a/eng/Versions.props b/eng/Versions.props index 3f8ad32e6..347d96ab7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19455.15 + 3.1.0-preview1.19455.16 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19455.15 + 2.1.0-preview1.19455.16 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19455.15 + 3.1.0-preview1.19455.16 $(MicrosoftWindowsDesktopAppPackageVersion) From 859ed08637837772832741d76ef8d46849ed0bfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Sep 2019 03:50:28 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/core-setup build 20190905.25 - Microsoft.NETCore.App - 3.1.0-preview1.19455.25 - NETStandard.Library.Ref - 2.1.0-preview1.19455.25 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19455.25 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f11c02370..be6d56ecd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 + db11b05953ca56752b3da4cce203472c40fa6c3c - + https://github.com/dotnet/core-setup - 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 + db11b05953ca56752b3da4cce203472c40fa6c3c - + https://github.com/dotnet/core-setup - 8cdffdc87fb6c1d63adb575df18645e5e45c0d94 + db11b05953ca56752b3da4cce203472c40fa6c3c https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 347d96ab7..7ebe9d507 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19455.16 + 3.1.0-preview1.19455.25 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19455.16 + 2.1.0-preview1.19455.25 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19455.16 + 3.1.0-preview1.19455.25 $(MicrosoftWindowsDesktopAppPackageVersion) From 00efa2c3941683e6daf20c949ce60dec1d730efd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Sep 2019 09:05:29 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/core-setup build 20190905.31 - Microsoft.NETCore.App - 3.1.0-preview1.19455.31 - NETStandard.Library.Ref - 2.1.0-preview1.19455.31 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19455.31 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-preview9.19417.1 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-preview9.19417.4 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be6d56ecd..e939068ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - db11b05953ca56752b3da4cce203472c40fa6c3c + 7194756bb3b052f1550dd50d3e229b350d348da2 - + https://github.com/dotnet/core-setup - db11b05953ca56752b3da4cce203472c40fa6c3c + 7194756bb3b052f1550dd50d3e229b350d348da2 - + https://github.com/dotnet/core-setup - db11b05953ca56752b3da4cce203472c40fa6c3c + 7194756bb3b052f1550dd50d3e229b350d348da2 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index 7ebe9d507..840cb4f46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19455.25 + 3.1.0-preview1.19455.31 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19455.25 + 2.1.0-preview1.19455.31 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19455.25 + 3.1.0-preview1.19455.31 $(MicrosoftWindowsDesktopAppPackageVersion) From eae6863f64267f2f351842ff622a6bd56a77cca0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Sep 2019 00:50:29 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/core-setup build 20190906.22 - Microsoft.NETCore.App - 3.1.0-preview1.19456.22 - NETStandard.Library.Ref - 2.1.0-preview1.19456.22 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19456.22 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e939068ba..7ac492a6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 7194756bb3b052f1550dd50d3e229b350d348da2 + 321d01390849836541c2caac6d124c75ef961578 - + https://github.com/dotnet/core-setup - 7194756bb3b052f1550dd50d3e229b350d348da2 + 321d01390849836541c2caac6d124c75ef961578 - + https://github.com/dotnet/core-setup - 7194756bb3b052f1550dd50d3e229b350d348da2 + 321d01390849836541c2caac6d124c75ef961578 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 71744d3163293fc31cd1c1917929cf172d22bcaa - + https://github.com/dotnet/winforms - dd6650900f5af7283c6af6ec85de4d8d51f28961 + 9104c48ca015b5a4c8e029c330af6d68bc11b0b8 - + https://github.com/dotnet/wpf - ffc3fbd836fb6ff3c28e50fec67be5b55c8b6542 + 1c3dd24d7188899a5f12d1caa31630f66bd4c2fd diff --git a/eng/Versions.props b/eng/Versions.props index 840cb4f46..cf57ec2be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19417.1 + 4.8.0-rc1.19455.20 - 3.0.0-preview9.19417.4 + 3.0.0-rc1.19455.14 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19455.31 + 3.1.0-preview1.19456.22 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19455.31 + 2.1.0-preview1.19456.22 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19455.31 + 3.1.0-preview1.19456.22 $(MicrosoftWindowsDesktopAppPackageVersion) From 16b99878e57756b083638fa86bd97319d99818dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Sep 2019 11:30:32 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/core-setup build 20190907.3 - Microsoft.NETCore.App - 3.1.0-preview1.19457.3 - NETStandard.Library.Ref - 2.1.0-preview1.19457.3 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19457.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ac492a6d..4da405e4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 321d01390849836541c2caac6d124c75ef961578 + 010434a4dca048793d5cd720a67a2748f91c037f - + https://github.com/dotnet/core-setup - 321d01390849836541c2caac6d124c75ef961578 + 010434a4dca048793d5cd720a67a2748f91c037f - + https://github.com/dotnet/core-setup - 321d01390849836541c2caac6d124c75ef961578 + 010434a4dca048793d5cd720a67a2748f91c037f https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index cf57ec2be..ec7eb9527 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19456.22 + 3.1.0-preview1.19457.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19456.22 + 2.1.0-preview1.19457.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19456.22 + 3.1.0-preview1.19457.3 $(MicrosoftWindowsDesktopAppPackageVersion) From 7b0c1272179b7a4ec2e2992ba30a7f0971deb409 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Sep 2019 18:10:29 +0000 Subject: [PATCH 09/14] Update dependencies from https://github.com/dotnet/core-setup build 20190907.10 - Microsoft.NETCore.App - 3.1.0-preview1.19457.10 - NETStandard.Library.Ref - 2.1.0-preview1.19457.10 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19457.10 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4da405e4c..59c23f566 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 010434a4dca048793d5cd720a67a2748f91c037f + e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac - + https://github.com/dotnet/core-setup - 010434a4dca048793d5cd720a67a2748f91c037f + e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac - + https://github.com/dotnet/core-setup - 010434a4dca048793d5cd720a67a2748f91c037f + e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index ec7eb9527..a1aa9de97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19457.3 + 3.1.0-preview1.19457.10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19457.3 + 2.1.0-preview1.19457.10 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19457.3 + 3.1.0-preview1.19457.10 $(MicrosoftWindowsDesktopAppPackageVersion) From 7d91a04e9bf16efe88b2c53e86e0c17132f20e71 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Sep 2019 16:25:28 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/core-setup build 20190908.3 - Microsoft.NETCore.App - 3.1.0-preview1.19458.3 - NETStandard.Library.Ref - 2.1.0-preview1.19458.3 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19458.3 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59c23f566..918a5b3d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac + 3f71391d25658ef00495eb76526e6cbac9e48a0b - + https://github.com/dotnet/core-setup - e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac + 3f71391d25658ef00495eb76526e6cbac9e48a0b - + https://github.com/dotnet/core-setup - e82ca592278b19fa8359c30ecbbc80cf0ae9e4ac + 3f71391d25658ef00495eb76526e6cbac9e48a0b https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index a1aa9de97..db3157eb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19457.10 + 3.1.0-preview1.19458.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19457.10 + 2.1.0-preview1.19458.3 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19457.10 + 3.1.0-preview1.19458.3 $(MicrosoftWindowsDesktopAppPackageVersion) From 9a474a4131fa66c195b76a183bf32cad8d2e5969 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Sep 2019 18:35:30 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/core-setup build 20190908.7 - Microsoft.NETCore.App - 3.1.0-preview1.19458.7 - NETStandard.Library.Ref - 2.1.0-preview1.19458.7 - Microsoft.WindowsDesktop.App - 3.1.0-preview1.19458.7 Dependency coherency updates - Microsoft.Dotnet.WinForms.ProjectTemplates - 4.8.0-rc1.19455.20 (parent: Microsoft.WindowsDesktop.App) - Microsoft.DotNet.Wpf.ProjectTemplates - 3.0.0-rc1.19455.14 (parent: Microsoft.WindowsDesktop.App) --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 918a5b3d2..394bb5c26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - 3f71391d25658ef00495eb76526e6cbac9e48a0b + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/dotnet/core-setup - 3f71391d25658ef00495eb76526e6cbac9e48a0b + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/dotnet/core-setup - 3f71391d25658ef00495eb76526e6cbac9e48a0b + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 https://github.com/aspnet/AspNetCore diff --git a/eng/Versions.props b/eng/Versions.props index db3157eb5..77455e750 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.1.0-preview1.19458.3 + 3.1.0-preview1.19458.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-preview1.19458.3 + 2.1.0-preview1.19458.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.1.0-preview1.19458.3 + 3.1.0-preview1.19458.7 $(MicrosoftWindowsDesktopAppPackageVersion) From 724015cc60c6aa3ea2dc974103adc320d992b676 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 10 Sep 2019 13:53:43 -0700 Subject: [PATCH 12/14] Update latest patch versions --- src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 48bb975f7..b92727fc0 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -107,11 +107,11 @@ + LatestVersion="2.1.13" /> + LatestVersion="2.2.7" /> + LatestVersion="2.1.13"/> + LatestVersion="2.1.13"/> + LatestVersion="2.2.7"/> + LatestVersion="2.2.7"/> From 827464d908606a3a5a0081e799b96ea4e171bce7 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 10 Sep 2019 13:58:14 -0700 Subject: [PATCH 13/14] Add support for targeting .NET Core 3.1 --- .../targets/GenerateBundledVersions.targets | 79 +++++++++++++++++-- test/EndToEnd/ProjectBuildTests.cs | 2 +- 2 files changed, 75 insertions(+), 6 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index b92727fc0..a77fc9160 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -30,6 +30,11 @@ <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) + <_NETCoreApp30PackageVersion>3.0.0-rc1-19456-20 + <_NETCoreApp30TargetingPackVersion>$(_NETCoreApp30PackageVersion) + <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) + <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -79,6 +84,10 @@ linux-x64; linux-arm; linux-arm64" /> + + + + + + + + + + + + + + + + Date: Tue, 10 Sep 2019 14:32:07 -0700 Subject: [PATCH 14/14] Exclude ASP.NET targeting pack and shared framework from RPM/debs until we have 3.1 versions --- src/redist/targets/GenerateDebs.targets | 14 ++++---------- src/redist/targets/GenerateRPMs.targets | 5 ----- .../packaging/deb/dotnet-debian_config.json | 4 +--- .../targets/packaging/rpm/dotnet-config.json | 8 -------- 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets index 421b6e70a..5336d80b5 100644 --- a/src/redist/targets/GenerateDebs.targets +++ b/src/redist/targets/GenerateDebs.targets @@ -235,12 +235,10 @@ - - - - + - - + @@ -353,11 +351,9 @@ - - @@ -374,11 +370,9 @@ - - diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 3f5a07e08..5755bd5df 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -286,12 +286,9 @@ - - - @@ -304,11 +301,9 @@ - - diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 35a0f433f..836d41375 100644 --- a/src/redist/targets/packaging/deb/dotnet-debian_config.json +++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json @@ -32,8 +32,6 @@ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%, "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, "%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, - "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" }, - "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }, - "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" } + "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" } } } diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index fd090e2d8..d06c428f1 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -37,14 +37,6 @@ { "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" - }, - { - "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" - }, - { - "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" } ], "directories": [