diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 3febb679816..6c641a53180 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,36 +6,40 @@ This file should be imported by eng/Versions.props
- 10.0.0-beta.25427.104
- 10.0.0-beta.25427.104
- 10.0.0-beta.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
- 10.0.0-rc.2.25427.104
-
- 17.15.0-preview-25453-107
- 17.15.0-preview-25453-107
- 17.15.0-preview-25453-107
-
- 5.0.0-2.25453.107
- 5.0.0-2.25453.107
- 5.0.0-2.25453.107
+ 17.15.0-preview-25454-107
+ 17.15.0-preview-25454-107
+ 17.15.0-preview-25454-107
+ 5.0.0-2.25454.107
+ 5.0.0-2.25454.107
+ 5.0.0-2.25454.107
+ 10.0.0-beta.25454.107
+ 10.0.0-beta.25454.107
+ 10.0.0-beta.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ 10.0.0-rc.2.25454.107
+ $(MicrosoftBuildFrameworkPackageVersion)
+ $(MicrosoftBuildTasksCorePackageVersion)
+ $(MicrosoftBuildUtilitiesCorePackageVersion)
+ $(MicrosoftCodeAnalysisCSharpPackageVersion)
+ $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)
+ $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)
$(MicrosoftDotNetArcadeSdkPackageVersion)
$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)
$(MicrosoftDotNetHelixSdkPackageVersion)
@@ -54,13 +58,5 @@ This file should be imported by eng/Versions.props
$(SystemRuntimeCachingPackageVersion)
$(SystemTextEncodingsWebPackageVersion)
$(SystemTextJsonPackageVersion)
-
- $(MicrosoftBuildFrameworkPackageVersion)
- $(MicrosoftBuildUtilitiesCorePackageVersion)
- $(MicrosoftBuildTasksCorePackageVersion)
-
- $(MicrosoftCodeAnalysisCSharpPackageVersion)
- $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)
- $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 51f264ac1ac..7ef9ed60824 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,104 +1,104 @@
-
+
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
- https://github.com/dotnet/msbuild
- 53a2d6ba9edc932e724dc80a5a56eeb9943863cf
+
+ https://github.com/dotnet/dotnet
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
- https://github.com/dotnet/msbuild
- 53a2d6ba9edc932e724dc80a5a56eeb9943863cf
+
+ https://github.com/dotnet/dotnet
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
- https://github.com/dotnet/msbuild
- 53a2d6ba9edc932e724dc80a5a56eeb9943863cf
+
+ https://github.com/dotnet/dotnet
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
- https://github.com/dotnet/roslyn
- e5924c0044a45b9b10ccde820a447adbb636f8be
+
+ https://github.com/dotnet/dotnet
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
- https://github.com/dotnet/roslyn
- e5924c0044a45b9b10ccde820a447adbb636f8be
+
+ https://github.com/dotnet/dotnet
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
- https://github.com/dotnet/roslyn
- e5924c0044a45b9b10ccde820a447adbb636f8be
+
+ https://github.com/dotnet/dotnet
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
-
+
https://github.com/dotnet/dotnet
- 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3
+ 96384f46287cd0b6ae49f3885676e3d1635c7894
diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml
index 947f0971eb5..d805d5faeb9 100644
--- a/eng/common/core-templates/job/source-build.yml
+++ b/eng/common/core-templates/job/source-build.yml
@@ -34,9 +34,6 @@ parameters:
# container and pool.
platform: {}
- # Optional list of directories to ignore for component governance scans.
- componentGovernanceIgnoreDirectories: []
-
is1ESPipeline: ''
# If set to true and running on a non-public project,
@@ -97,4 +94,3 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
platform: ${{ parameters.platform }}
- componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml
index 95d697597ac..30530359a5d 100644
--- a/eng/common/core-templates/job/source-index-stage1.yml
+++ b/eng/common/core-templates/job/source-index-stage1.yml
@@ -41,4 +41,4 @@ jobs:
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
parameters:
- binLogPath: ${{ parameters.binLogPath }}
+ binLogPath: ${{ parameters.binLogPath }}
\ No newline at end of file
diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml
index eb4b923a777..d92860cba20 100644
--- a/eng/common/core-templates/jobs/source-build.yml
+++ b/eng/common/core-templates/jobs/source-build.yml
@@ -15,9 +15,6 @@ parameters:
# one job runs on 'defaultManagedPlatform'.
platforms: []
- # Optional list of directories to ignore for component governance scans.
- componentGovernanceIgnoreDirectories: []
-
is1ESPipeline: ''
# If set to true and running on a non-public project,
@@ -34,7 +31,6 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ platform }}
- componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
- ${{ if eq(length(parameters.platforms), 0) }}:
@@ -43,5 +39,4 @@ jobs:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
jobNamePrefix: ${{ parameters.jobNamePrefix }}
platform: ${{ parameters.defaultManagedPlatform }}
- componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}
enableInternalSources: ${{ parameters.enableInternalSources }}
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index 77321eee11f..acf16ed3496 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -11,10 +11,6 @@ parameters:
# for details. The entire object is described in the 'job' template for simplicity, even though
# the usage of the properties on this object is split between the 'job' and 'steps' templates.
platform: {}
-
- # Optional list of directories to ignore for component governance scans.
- componentGovernanceIgnoreDirectories: []
-
is1ESPipeline: false
steps:
diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh
index 0c92f81d74f..3270f83fa9a 100755
--- a/eng/common/sdk-task.sh
+++ b/eng/common/sdk-task.sh
@@ -10,7 +10,7 @@ show_usage() {
echo "Advanced settings:"
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
- echo " --noWarnAsError Do not warn as error
+ echo " --noWarnAsError Do not warn as error"
echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
}
diff --git a/global.json b/global.json
index fa0176d4660..b378a3e1f6a 100644
--- a/global.json
+++ b/global.json
@@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104"
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25454.107",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25454.107"
}
}