From 769030cd4dfa6beae7e8f22aad3781936442f168 Mon Sep 17 00:00:00 2001
From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:04:02 -0800
Subject: [PATCH] Merging internal commits for release/8.0.1xx (#17785)
---
NuGet.config | 13 ++
eng/Version.Details.xml | 153 +++++++++---------
eng/Versions.props | 42 ++---
.../content/repo-projects/aspire.proj | 13 ++
.../content/repo-projects/dotnet.proj | 1 +
.../baselines/licenses/Licenses.aspire.json | 3 +
src/VirtualMonoRepo/source-mappings.json | 7 +
src/redist/targets/BundledManifests.targets | 2 +-
8 files changed, 138 insertions(+), 96 deletions(-)
create mode 100644 src/SourceBuild/content/repo-projects/aspire.proj
create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json
diff --git a/NuGet.config b/NuGet.config
index 8deb1a440..71b75cf38 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,15 +7,22 @@
+
+
+
+
+
+
+
@@ -30,17 +37,23 @@
+
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fbfc40db1..67a7a2a3a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,46 +5,46 @@
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
-->
-
- https://github.com/dotnet/windowsdesktop
- 544c2e622c03eef94355718e7e671b193b0102d9
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
+ c0170915ed6c164a594cd9d558d44aaf98fc6961
-
- https://github.com/dotnet/windowsdesktop
- 544c2e622c03eef94355718e7e671b193b0102d9
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
+ c0170915ed6c164a594cd9d558d44aaf98fc6961
-
- https://github.com/dotnet/windowsdesktop
- 544c2e622c03eef94355718e7e671b193b0102d9
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
+ c0170915ed6c164a594cd9d558d44aaf98fc6961
-
- https://github.com/dotnet/windowsdesktop
- 544c2e622c03eef94355718e7e671b193b0102d9
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
+ c0170915ed6c164a594cd9d558d44aaf98fc6961
-
- https://github.com/dotnet/runtime
- 488a8a3521610422e8fbe22d5cc66127f3dce3dc
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 5535e31a712343a63f5d7d796cd874e563e5ac14
- https://github.com/dotnet/runtime
- 488a8a3521610422e8fbe22d5cc66127f3dce3dc
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 5535e31a712343a63f5d7d796cd874e563e5ac14
-
- https://github.com/dotnet/runtime
- 488a8a3521610422e8fbe22d5cc66127f3dce3dc
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 5535e31a712343a63f5d7d796cd874e563e5ac14
- https://github.com/dotnet/runtime
- 488a8a3521610422e8fbe22d5cc66127f3dce3dc
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 5535e31a712343a63f5d7d796cd874e563e5ac14
- https://github.com/dotnet/runtime
- 488a8a3521610422e8fbe22d5cc66127f3dce3dc
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 5535e31a712343a63f5d7d796cd874e563e5ac14
- https://github.com/dotnet/runtime
- 488a8a3521610422e8fbe22d5cc66127f3dce3dc
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 5535e31a712343a63f5d7d796cd874e563e5ac14
@@ -52,55 +52,55 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
- https://github.com/dotnet/runtime
- 488a8a3521610422e8fbe22d5cc66127f3dce3dc
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 5535e31a712343a63f5d7d796cd874e563e5ac14
-
- https://github.com/dotnet/aspnetcore
- b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
+ 3f1acb59718cadf111a0a796681e3d3509bb3381
-
- https://github.com/dotnet/aspnetcore
- b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
+ 3f1acb59718cadf111a0a796681e3d3509bb3381
-
- https://github.com/dotnet/aspnetcore
- b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
+ 3f1acb59718cadf111a0a796681e3d3509bb3381
-
- https://github.com/dotnet/aspnetcore
- b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
+ 3f1acb59718cadf111a0a796681e3d3509bb3381
-
- https://github.com/dotnet/aspnetcore
- b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
+ 3f1acb59718cadf111a0a796681e3d3509bb3381
-
- https://github.com/dotnet/aspnetcore
- b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
+ 3f1acb59718cadf111a0a796681e3d3509bb3381
-
- https://github.com/dotnet/aspnetcore
- b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
+ 3f1acb59718cadf111a0a796681e3d3509bb3381
- https://github.com/dotnet/sdk
- a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ e9d13cbe7e8c1d52ce276a8655f52a87e1017c46
-
- https://github.com/dotnet/sdk
- a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ e9d13cbe7e8c1d52ce276a8655f52a87e1017c46
-
- https://github.com/dotnet/sdk
- a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ e9d13cbe7e8c1d52ce276a8655f52a87e1017c46
-
- https://github.com/dotnet/sdk
- a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
+ e9d13cbe7e8c1d52ce276a8655f52a87e1017c46
https://github.com/dotnet/test-templates
@@ -124,13 +124,13 @@
1e5f3603af2277910aad946736ee23283e7f3e16
-
- https://github.com/dotnet/winforms
- d77ef3b1a253a99d0be23cec35e84d2fb3317ac5
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
+ e4ede9b8979b9d2b1b1d4383f30a791414f0625b
-
- https://github.com/dotnet/wpf
- eb2c28846bd06cc11a0cd432d55639a850a829a3
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
+ 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a
https://github.com/dotnet/fsharp
@@ -147,12 +147,12 @@
- https://github.com/dotnet/runtime
- 488a8a3521610422e8fbe22d5cc66127f3dce3dc
+ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
+ 5535e31a712343a63f5d7d796cd874e563e5ac14
-
+
https://github.com/dotnet/roslyn
- 12b11685a551e0a6a203dcecb584f610f4df1157
+ f43cd10b737b6343956dee421cff8c50b602c788
@@ -170,11 +170,16 @@
https://github.com/dotnet/emsdk
- 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed
+ 2406616d0e3a31d80b326e27c156955bfa41c791
-
+
+ https://dev.azure.com/dnceng/internal/_git/dotnet-aspire
+ 48e42f59d64d84b404e904996a9ed61f2a17a569
+
+
+
https://github.com/dotnet/emsdk
- 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed
+ 2406616d0e3a31d80b326e27c156955bfa41c791
diff --git a/eng/Versions.props b/eng/Versions.props
index eb367e89a..738bfd22c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,11 +48,11 @@
- 8.0.0-rtm.23524.1
+ 8.0.0-rtm.23531.5
- 8.0.0-rtm.23524.1
+ 8.0.0-rtm.23531.4
@@ -72,13 +72,13 @@
- 8.0.0-rtm.23524.5
- 8.0.0-rtm.23524.5
- 8.0.0-rtm.23524.5
- 8.0.0-rtm.23524.5
- 8.0.0-rtm.23524.5
- 8.0.0-rtm.23524.5
- 8.0.0-rtm.23524.5
+ 8.0.0
+ 8.0.0
+ 8.0.0-rtm.23531.12
+ 8.0.0-rtm.23531.12
+ 8.0.0-rtm.23531.12
+ 8.0.0-rtm.23531.12
+ 8.0.0-rtm.23531.12
0.2.0
@@ -86,24 +86,24 @@
8.0.100
- 8.0.100-rtm.23524.25
- 8.0.100-rtm.23524.25
+ 8.0.100-rtm.23551.6
+ 8.0.100-rtm.23551.6
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
- 4.8.0-3.23524.2
+ 4.8.0-3.23524.11
- 8.0.0-rtm.23523.12
+ 8.0.0-rtm.23531.3
- 8.0.0-rtm.23523.12
- 8.0.0-rtm.23523.12
+ 8.0.0-rtm.23531.3
+ 8.0.0-rtm.23531.3
8.0.0
8.0.0
8.0.0
@@ -112,10 +112,10 @@
- 8.0.0-rtm.23524.1
- 8.0.0-rtm.23524.1
- 8.0.0-rtm.23524.1
- 8.0.0-rtm.23524.1
+ 8.0.0-rtm.23551.1
+ 8.0.0-rtm.23551.1
+ 8.0.0
+ 8.0.0
@@ -239,8 +239,8 @@
- 8.0.100-rc.1
- 8.0.0-alpha.23471.13
+ 8.0.100
+ 8.0.0-preview.1.23557.2
8.0.100
8.0.3
34.0.43
diff --git a/src/SourceBuild/content/repo-projects/aspire.proj b/src/SourceBuild/content/repo-projects/aspire.proj
new file mode 100644
index 000000000..7d41e5e5f
--- /dev/null
+++ b/src/SourceBuild/content/repo-projects/aspire.proj
@@ -0,0 +1,13 @@
+
+
+
+
+ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs)
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj
index 23c5d842a..26ce0941f 100644
--- a/src/SourceBuild/content/repo-projects/dotnet.proj
+++ b/src/SourceBuild/content/repo-projects/dotnet.proj
@@ -45,6 +45,7 @@
+
diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json
new file mode 100644
index 000000000..6941fa698
--- /dev/null
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json
@@ -0,0 +1,3 @@
+{
+ "files": []
+}
\ No newline at end of file
diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json
index 831fae959..7e6c1ccd5 100644
--- a/src/VirtualMonoRepo/source-mappings.json
+++ b/src/VirtualMonoRepo/source-mappings.json
@@ -60,6 +60,13 @@
"src/Microsoft.DotNet.SignTool.Tests/*.vsix"
]
},
+ {
+ "name": "aspire",
+ "defaultRemote": "https://github.com/dotnet/aspire",
+ "exclude": [
+ "src/Aspire.Dashboard/**/*"
+ ]
+ },
{
"name": "aspnetcore",
"defaultRemote": "https://github.com/dotnet/aspnetcore",
diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index d6db716b9..73402bced 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -4,7 +4,6 @@
-
@@ -17,6 +16,7 @@
+