diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26678ccddae..72ded1fb112 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,60 +10,60 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/core-setup + 4ace84dbf94128b4825c76cdd09b46dba7473478 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/corefx + a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/coreclr + b415b57a15b0c6ba77e63df901823bb46b8aafda 5596 - - https://github.com/dotnet/runtime - 773f64296d3c6932f716ae6c8932662ade93b284 + + https://github.com/dotnet/coreclr + b415b57a15b0c6ba77e63df901823bb46b8aafda 5596 diff --git a/eng/Versions.props b/eng/Versions.props index 861d672547a..813f0f9f0b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,25 +10,25 @@ - 5.0.0-alpha.1.20062.3 + 5.0.0-alpha1.19514.1 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 - 5.0.0-alpha.1.20062.3 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 + 5.0.0-alpha1.19504.7 - 3.0.0-preview5-27616-73 - 5.0.0-alpha.1.20062.3 + 3.0.0-preview5-27616-73 + 5.0.0-alpha1.19513.3 diff --git a/global.json b/global.json index 796e0f22c40..346c3c6fdab 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20062.1", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20062.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20062.3" + "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3" }, "native-tools": { "dotnet-api-docs_netcoreapp3.0": "0.0.0.1" diff --git a/pkg/Microsoft.Private.Winforms/FrameworkListFiles.props b/pkg/Microsoft.Private.Winforms/FrameworkListFiles.props new file mode 100644 index 00000000000..534c85ea681 --- /dev/null +++ b/pkg/Microsoft.Private.Winforms/FrameworkListFiles.props @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj b/pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj index afdd6a21a59..116c207afcc 100644 --- a/pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj +++ b/pkg/Microsoft.Private.Winforms/Microsoft.Private.Winforms.csproj @@ -51,6 +51,13 @@ All + + + + True + + +