Skip to content

Commit a537404

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 36648: [internal/release/7.0.4xx] Merge from public
Merge from public release/7.0.4xx to internal/release/7.0.4xx and resolve conflicts if necessary
2 parents 68d4f4e + 44e2f35 commit a537404

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

‎eng/Version.Details.xml

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="7.0.406">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>6f5abf9dcede8b854d1d03ed0180d83e1aedfe44</Sha>
6+
<Sha>67c6c16494b193d25a24e6e71091fcf59759538c</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="7.0.406-servicing.true.24060.15">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="7.0.406-servicing.true.24067.5">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>6f5abf9dcede8b854d1d03ed0180d83e1aedfe44</Sha>
10+
<Sha>67c6c16494b193d25a24e6e71091fcf59759538c</Sha>
1111
<SourceBuild RepoName="templating" ManagedOnly="true" />
1212
</Dependency>
1313
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.16">
@@ -283,22 +283,22 @@
283283
</Dependency>
284284
</ProductDependencies>
285285
<ToolsetDependencies>
286-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24061.2">
286+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24065.4">
287287
<Uri>https://github.com/dotnet/arcade</Uri>
288-
<Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
288+
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
289289
<SourceBuild RepoName="arcade" ManagedOnly="true" />
290290
</Dependency>
291-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24061.2">
291+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24065.4">
292292
<Uri>https://github.com/dotnet/arcade</Uri>
293-
<Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
293+
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24061.2">
295+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24065.4">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
297+
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24061.2">
299+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24065.4">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>d6372b3e4dcd568d7412ab1e60003fa1083aaa5f</Sha>
301+
<Sha>feda715e3fb6d511eaa39071bb9d77351cf4d943</Sha>
302302
</Dependency>
303303
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
304304
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -309,9 +309,9 @@
309309
<Sha>740189d758fb3bbdc118c5b6171ef1a7351a8c44</Sha>
310310
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
311311
</Dependency>
312-
<Dependency Name="Microsoft.TemplateEngine.TestHelper" Version="7.0.406-servicing.true.24060.15">
312+
<Dependency Name="Microsoft.TemplateEngine.TestHelper" Version="7.0.406-servicing.true.24067.5">
313313
<Uri>https://github.com/dotnet/templating</Uri>
314-
<Sha>6f5abf9dcede8b854d1d03ed0180d83e1aedfe44</Sha>
314+
<Sha>67c6c16494b193d25a24e6e71091fcf59759538c</Sha>
315315
</Dependency>
316316
</ToolsetDependencies>
317317
</Dependencies>

‎eng/Versions.props

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24061.2</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24065.4</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -134,8 +134,8 @@
134134
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
135135
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
136136
<!-- test dependencies -->
137-
<MicrosoftTemplateEngineMocksPackageVersion>7.0.406-servicing.true.24060.15</MicrosoftTemplateEngineMocksPackageVersion>
138-
<MicrosoftTemplateEngineTestHelperPackageVersion>7.0.406-servicing.true.24060.15</MicrosoftTemplateEngineTestHelperPackageVersion>
137+
<MicrosoftTemplateEngineMocksPackageVersion>7.0.406-servicing.true.24067.5</MicrosoftTemplateEngineMocksPackageVersion>
138+
<MicrosoftTemplateEngineTestHelperPackageVersion>7.0.406-servicing.true.24067.5</MicrosoftTemplateEngineTestHelperPackageVersion>
139139
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
140140
</PropertyGroup>
141141
<PropertyGroup>
@@ -190,7 +190,7 @@
190190
<PropertyGroup>
191191
<FluentAssertionsVersion>6.11.0</FluentAssertionsVersion>
192192
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
193-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24061.2</MicrosoftDotNetXUnitExtensionsVersion>
193+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24065.4</MicrosoftDotNetXUnitExtensionsVersion>
194194
<MoqPackageVersion>4.18.4</MoqPackageVersion>
195195
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
196196
</PropertyGroup>

‎eng/common/native/init-compiler.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if [[ -z "$CLR_CC" ]]; then
7171
# Set default versions
7272
if [[ -z "$majorVersion" ]]; then
7373
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
74-
if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
74+
if [[ "$compiler" == "clang" ]]; then versions=( 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
7575
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
7676

7777
for version in "${versions[@]}"; do

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24061.2",
15-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24061.2"
14+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24065.4",
15+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.24065.4"
1616
}
1717
}

‎src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.props

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ Copyright (c) .NET Foundation. All rights reserved.
3232
<TrimMode Condition="'$(TrimMode)' == ''">partial</TrimMode>
3333
<TrimmerRemoveSymbols Condition="'$(TrimmerRemoveSymbols)' == ''">false</TrimmerRemoveSymbols>
3434

35+
<!-- Disable accelerated builds in Visual Studio -->
36+
<AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
37+
3538
<!-- Static web assets defaults -->
3639
<StaticWebAssetBasePath Condition="'$(StaticWebAssetBasePath)' == ''">/</StaticWebAssetBasePath>
37-
<StaticWebAssetProjectMode Condition="'$(StaticWebAssetProjectMode)' == ''">Root</StaticWebAssetProjectMode>
40+
<StaticWebAssetProjectMode Condition="'$(StaticWebAssetProjectMode)' == ''">Root</StaticWebAssetProjectMode>
3841
<StaticWebAssetsGetPublishAssetsTargets>ComputeFilesToPublish;GetCurrentProjectPublishStaticWebAssetItems</StaticWebAssetsGetPublishAssetsTargets>
3942
<StaticWebAssetsAdditionalPublishProperties>$(StaticWebAssetsAdditionalPublishProperties);BuildProjectReferences=false;ResolveAssemblyReferencesFindRelatedSatellites=true;_PublishingBlazorWasmProject=true</StaticWebAssetsAdditionalPublishProperties>
4043
<StaticWebAssetsAdditionalPublishPropertiesToRemove>$(StaticWebAssetsAdditionalPublishPropertiesToRemove);NoBuild;RuntimeIdentifier</StaticWebAssetsAdditionalPublishPropertiesToRemove>

0 commit comments

Comments
 (0)