Skip to content

Commit ed9d718

Browse files
DonnaChen888DonnaChen888
authored
Merge branch 'main' into darc-main-f2cc7816-88c4-4306-b7d2-21bc5c434f09
2 parents 40629f1 + a40a96a commit ed9d718

File tree

143 files changed

+1475
-887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+1475
-887
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
3838
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
3939
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)" />
40+
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.HotReload" Version="$(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion)" />
4041

4142
<!-- roslyn-sdk dependencies-->
4243
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
@@ -81,8 +82,6 @@
8182
<PackageVersion Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
8283
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
8384
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
84-
<PackageVersion Include="Microsoft.VisualStudio.Sdk" Version="17.2.32505.173" />
85-
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.11.435" />
8685
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
8786
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="$(MicrosoftVisualStudioSolutionPersistenceVersion)" />
8887
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
<add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
3232
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
3333
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
34-
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
35-
<add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
3634
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
3735
<!-- Used for Rich Navigation indexing task -->
3836
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />

‎eng/Publishing.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
<Artifact Remove="@(MsiPackages)" />
4444
</ItemGroup>
4545

46+
<ItemGroup Condition="'$(PublishingWorkloadMsiInternal)' == 'true'">
47+
<Artifact Update="$(ArtifactsShippingPackagesDir)*.Msi.*.nupkg" Visibility="Internal" />
48+
</ItemGroup>
49+
4650
<Target Name="GetNonStableProductVersion">
4751
<!-- Retrieve the non-stable product version. -->
4852
<MSBuild Projects="$(RepoRoot)src\Layout\redist\redist.csproj"

‎eng/Signing.props‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,8 @@
8181
<FileSignInfo Include="Verify.dll" CertificateName="$(ExternalCertificateId)" />
8282
<FileSignInfo Include="Verify.DiffPlex.dll" CertificateName="$(ExternalCertificateId)" />
8383
</ItemGroup>
84-
85-
<ItemGroup>
86-
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
8784

85+
<ItemGroup>
8886
<!-- Roslyn apphosts -->
8987
<FileSignInfo Condition="'$(TargetOS)' == 'osx'" Include="csc;vbc;VBCSCompiler" CertificateName="MacDeveloperHarden" />
9088
</ItemGroup>

‎eng/Version.Details.props‎

Lines changed: 115 additions & 113 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml‎

Lines changed: 230 additions & 226 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
3030
in that build mode analyzer assemblies always target the live compiler API. -->
3131
<UsingToolMicrosoftNetCompilers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</UsingToolMicrosoftNetCompilers>
32-
<UsingToolVSSDK>true</UsingToolVSSDK>
3332
<FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
3433
</PropertyGroup>
3534
<PropertyGroup Label="Servicing version information">
@@ -113,7 +112,7 @@
113112
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
114113
115114
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
116-
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.8</MicrosoftBuildMinimumVersion>
115+
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.28</MicrosoftBuildMinimumVersion>
117116
<MinimumVSVersion>18.0</MinimumVSVersion>
118117
</PropertyGroup>
119118
<PropertyGroup>
@@ -127,7 +126,7 @@
127126
</PropertyGroup>
128127
<PropertyGroup Label="Manually updated">
129128
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
130-
<MicrosoftBuildLocatorPackageVersion>1.8.1</MicrosoftBuildLocatorPackageVersion>
129+
<MicrosoftBuildLocatorPackageVersion>1.10.2</MicrosoftBuildLocatorPackageVersion>
131130
<MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>4.0.1</MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>
132131
</PropertyGroup>
133132
<!-- Get .NET Framework reference assemblies from NuGet packages -->

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ EnableInternalPackageSource() {
6666
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
6767
if [ "$?" == "0" ]; then
6868
echo "Enabling internal source '$PackageSourceName'."
69-
# Remove the disabled entry
70-
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
71-
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
72-
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
69+
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
70+
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
7371

7472
# Add the source name to PackageSources for credential handling
7573
PackageSources+=("$PackageSourceName")

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ jobs:
9191
fetchDepth: 3
9292
clean: true
9393

94-
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95-
- ${{ if eq(parameters.publishingVersion, 3) }}:
94+
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95+
- ${{ if eq(parameters.publishingVersion, 3) }}:
9696
- task: DownloadPipelineArtifact@2
9797
displayName: Download Asset Manifests
9898
inputs:
@@ -117,9 +117,16 @@ jobs:
117117
flattenFolders: true
118118
condition: ${{ parameters.condition }}
119119
continueOnError: ${{ parameters.continueOnError }}
120-
120+
121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
parameters:
126+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127+
128+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129+
123130
- task: AzureCLI@2
124131
displayName: Publish Build Assets
125132
inputs:
@@ -132,9 +139,12 @@ jobs:
132139
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133140
/p:MaestroApiEndpoint=https://maestro.dot.net
134141
/p:OfficialBuildId=$(OfficialBuildId)
142+
-runtimeSourceFeed https://ci.dot.net/internal
143+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
144+
135145
condition: ${{ parameters.condition }}
136146
continueOnError: ${{ parameters.continueOnError }}
137-
147+
138148
- task: powershell@2
139149
displayName: Create ReleaseConfigs Artifact
140150
inputs:
@@ -162,7 +172,7 @@ jobs:
162172
artifactName: AssetManifests
163173
displayName: 'Publish Merged Manifest'
164174
retryCountOnTaskFailure: 10 # for any logs being locked
165-
sbomEnabled: false # we don't need SBOM for logs
175+
sbomEnabled: false # we don't need SBOM for logs
166176

167177
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
168178
parameters:
@@ -195,9 +205,11 @@ jobs:
195205
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
196206
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
197207
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
208+
-runtimeSourceFeed https://ci.dot.net/internal
209+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
198210
199211
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
200212
- template: /eng/common/core-templates/steps/publish-logs.yml
201213
parameters:
202214
is1ESPipeline: ${{ parameters.is1ESPipeline }}
203-
JobLabel: 'Publish_Artifacts_Logs'
215+
JobLabel: 'Publish_Artifacts_Logs'

0 commit comments

Comments
 (0)