diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 95b0ec61f1145..0f31b2b59a762 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21271.1",
+ "version": "1.0.0-prerelease.21276.1",
"commands": [
"xharness"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index df667cec5ea58..a8aa8c1ea7bed 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,114 +1,114 @@
-
+
https://github.com/dotnet/icu
- 207094bcc62a9235861af5e5a6f322f2039e71c6
+ 2a47d0a1051260215d42a95583ff8a331efca4c7
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
https://github.com/microsoft/vstest
140434f7109d357d0158ade9e5164a4861513965
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
-
+
https://github.com/dotnet/runtime-assets
- cd3c2629469591d7cf4d2e5139a4f8fcbb6191eb
+ 3f92f2642a176248e735f61d748ace8b9dfaa56a
https://github.com/dotnet/llvm-project
@@ -146,49 +146,49 @@
https://github.com/dotnet/runtime
38017c3935de95d0335bac04f4901ddfc2718656
-
+
https://github.com/dotnet/runtime
- f64f12aa83d9f2253eab10551b716d2ba09371d2
+ 5a26d12c41b866731a195938bf3c162ba4a04ce2
-
+
https://github.com/dotnet/runtime
- f64f12aa83d9f2253eab10551b716d2ba09371d2
+ 5a26d12c41b866731a195938bf3c162ba4a04ce2
-
+
https://github.com/dotnet/runtime
- f64f12aa83d9f2253eab10551b716d2ba09371d2
+ 5a26d12c41b866731a195938bf3c162ba4a04ce2
-
+
https://github.com/dotnet/runtime
- f64f12aa83d9f2253eab10551b716d2ba09371d2
+ 5a26d12c41b866731a195938bf3c162ba4a04ce2
-
+
https://github.com/dotnet/runtime
- f64f12aa83d9f2253eab10551b716d2ba09371d2
+ 5a26d12c41b866731a195938bf3c162ba4a04ce2
-
+
https://github.com/dotnet/runtime
- f64f12aa83d9f2253eab10551b716d2ba09371d2
+ 5a26d12c41b866731a195938bf3c162ba4a04ce2
-
+
https://github.com/dotnet/runtime
- f64f12aa83d9f2253eab10551b716d2ba09371d2
+ 5a26d12c41b866731a195938bf3c162ba4a04ce2
https://github.com/mono/linker
a621b9a630950026f5508c8089a59c0e825bd6e0
-
+
https://github.com/dotnet/xharness
- 98970876f4d21e6da5198a5c41de51ab1101089f
+ fd2a4a5bb1f3e81f909cd8999eb43a1e8ff4848e
-
+
https://github.com/dotnet/xharness
- 98970876f4d21e6da5198a5c41de51ab1101089f
+ fd2a4a5bb1f3e81f909cd8999eb43a1e8ff4848e
-
+
https://github.com/dotnet/arcade
- 50f5645789f9119c906755cb1d2549acdeb0d0b7
+ c2a8af3f309fc27402fa9c18bac6df757a9c41ed
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -210,9 +210,9 @@
https://github.com/dotnet/emsdk
5a2a6482a34c2fe9ed4f9f97bb787ef0a7737965
-
+
https://github.com/dotnet/hotreload-utils
- 54f4f9773ee08a6c248fc7857684cab3ab48a82d
+ 57f47db25bed1a6d79444ab839cf7e364ea96716
diff --git a/eng/Versions.props b/eng/Versions.props
index 5cd22a515a37f..3cc1cce375802 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -51,28 +51,28 @@
3.10.0-2.final
3.10.0-2.final
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 2.5.1-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
- 6.0.0-beta.21271.3
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 2.5.1-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
+ 6.0.0-beta.21276.5
5.9.0-preview.2
6.0.0-alpha.1.20612.4
- 6.0.0-preview.5.21267.1
- 6.0.0-preview.5.21267.1
+ 6.0.0-preview.6.21274.1
+ 6.0.0-preview.6.21274.1
3.1.0
- 6.0.0-preview.5.21267.1
+ 6.0.0-preview.6.21274.1
1.2.0-beta.304
4.3.0
@@ -102,24 +102,24 @@
4.3.1
4.7.0
4.7.0
- 6.0.0-preview.5.21267.1
- 6.0.0-preview.5.21267.1
+ 6.0.0-preview.6.21274.1
+ 6.0.0-preview.6.21274.1
4.3.0
4.5.4
4.5.0
1.1.1
4.3.0
- 6.0.0-preview.5.21267.1
+ 6.0.0-preview.6.21274.1
- 6.0.0-beta.21267.1
- 6.0.0-beta.21267.1
- 6.0.0-beta.21267.1
- 6.0.0-beta.21267.1
- 6.0.0-beta.21267.1
- 6.0.0-beta.21267.1
- 6.0.0-beta.21267.1
- 6.0.0-beta.21267.1
- 6.0.0-beta.21267.1
+ 6.0.0-beta.21275.1
+ 6.0.0-beta.21275.1
+ 6.0.0-beta.21275.1
+ 6.0.0-beta.21275.1
+ 6.0.0-beta.21275.1
+ 6.0.0-beta.21275.1
+ 6.0.0-beta.21275.1
+ 6.0.0-beta.21275.1
+ 6.0.0-beta.21275.1
1.0.0-prerelease.21275.7
1.0.0-prerelease.21275.7
@@ -148,9 +148,9 @@
1.0.1-prerelease-00006
16.9.0-preview-20201201-01
- 1.0.0-prerelease.21271.1
- 1.0.0-prerelease.21271.1
- 1.0.1-alpha.0.21271.1
+ 1.0.0-prerelease.21276.1
+ 1.0.0-prerelease.21276.1
+ 1.0.1-alpha.0.21276.1
2.4.1
2.4.2
1.3.0
@@ -164,7 +164,7 @@
6.0.100-preview.5.21267.3
$(MicrosoftNETILLinkTasksVersion)
- 6.0.0-preview.6.21268.1
+ 6.0.0-preview.6.21274.1
9.0.1-alpha.1.21267.1
9.0.1-alpha.1.21267.1
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index f55c43c6f4786..65f1d75f3d322 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -53,7 +53,7 @@ try {
}
if ($task -eq "") {
- Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task '" -ForegroundColor Red
+ Write-PipelineTelemetryError -Category 'Build' -Message "Missing required parameter '-task '"
Print-Usage
ExitWithExitCode 1
}
@@ -78,7 +78,7 @@ try {
$taskProject = GetSdkTaskProject $task
if (!(Test-Path $taskProject)) {
- Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task" -ForegroundColor Red
+ Write-PipelineTelemetryError -Category 'Build' -Message "Unknown task: $task"
ExitWithExitCode 1
}
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
index aad41464926c1..5023d36dcb3c5 100644
--- a/eng/common/templates/job/source-build.yml
+++ b/eng/common/templates/job/source-build.yml
@@ -15,6 +15,9 @@ parameters:
# nonPortable: false
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
# linux-x64), and compiling against distro-provided packages rather than portable ones.
+ # skipPublishValidation: false
+ # Disables publishing validation. By default, a check is performed to ensure no packages are
+ # published by source-build.
# container: ''
# A container to use. Runs in docker.
# pool: {}
diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml
index 58fa9a35b8ca9..8990dfc8c87cc 100644
--- a/eng/common/templates/post-build/channels/generic-internal-channel.yml
+++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml
@@ -40,6 +40,9 @@ stages:
pool:
vmImage: 'windows-2019'
steps:
+ - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
+ displayName: Warn about v2 Arcade Publishing Usage
+
# This is necessary whenever we want to publish/restore to an AzDO private feed
- task: NuGetAuthenticate@0
displayName: 'Authenticate to AzDO Feeds'
@@ -110,6 +113,9 @@ stages:
pool:
vmImage: 'windows-2019'
steps:
+ - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
+ displayName: Warn about v2 Arcade Publishing Usage
+
- task: DownloadBuildArtifacts@0
displayName: Download Build Assets
continueOnError: true
diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml
index b50c0b3bdb8e6..3220c6a4f92ff 100644
--- a/eng/common/templates/post-build/channels/generic-public-channel.yml
+++ b/eng/common/templates/post-build/channels/generic-public-channel.yml
@@ -42,6 +42,9 @@ stages:
pool:
vmImage: 'windows-2019'
steps:
+ - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
+ displayName: Warn about v2 Arcade Publishing Usage
+
- task: DownloadBuildArtifacts@0
displayName: Download Build Assets
continueOnError: true
@@ -109,6 +112,9 @@ stages:
pool:
vmImage: 'windows-2019'
steps:
+ - script: echo "##vso[task.logissue type=warning]Going forward, v2 Arcade publishing is no longer supported. Please read https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Publishing.md for details, then contact dnceng if you have further questions."
+ displayName: Warn about v2 Arcade Publishing Usage
+
- task: DownloadBuildArtifacts@0
displayName: Download Build Assets
continueOnError: true
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index 65ee5992bf460..e20637ed6a177 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -34,9 +34,14 @@ steps:
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
fi
+ publishArgs=
+ if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then
+ publishArgs='--publish'
+ fi
+
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
--configuration $buildConfig \
- --restore --build --pack --publish -bl \
+ --restore --build --pack $publishArgs -bl \
$officialBuildArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
diff --git a/global.json b/global.json
index 1a3e80f2e565b..d88dc48daf8da 100644
--- a/global.json
+++ b/global.json
@@ -12,13 +12,13 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21271.3",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21276.5",
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21271.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21271.3",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21271.3",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21276.5",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21276.5",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21276.5",
"Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23",
- "Microsoft.NET.Sdk.IL": "6.0.0-preview.5.21267.1"
+ "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21274.1"
}
}
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
index 19b7ac9409546..2489544cad8b5 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
@@ -144,4 +144,17 @@
true
+
+
+
+
+
+ tools
+
+
+
+
+
+
diff --git a/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs b/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs
index 7004f1d425990..a664a967d8893 100644
--- a/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs
+++ b/src/tasks/Crossgen2Tasks/PrepareForReadyToRunCompilation.cs
@@ -341,6 +341,12 @@ private static bool IsNonCompositeReadyToRunImage(PEReader peReader)
private static Eligibility GetInputFileEligibility(ITaskItem file, bool compositeCompile, HashSet exclusionSet, HashSet r2rCompositeExclusionSet)
{
// Check to see if this is a valid ILOnly image that we can compile
+ if (!file.ItemSpec.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) && !file.ItemSpec.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
+ {
+ // If it isn't a dll or an exe, it certainly isn't a valid ILOnly image for compilation
+ return Eligibility.None;
+ }
+
using (FileStream fs = new FileStream(file.ItemSpec, FileMode.Open, FileAccess.Read))
{
try