Skip to content

Commit 6136804

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-1ae47360-b271-40fd-9be8-c57f6d4fb9d9
2 parents 85b4178 + e05cc0f commit 6136804

File tree

6 files changed

+29
-14
lines changed

6 files changed

+29
-14
lines changed

‎NuGet.config‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,16 @@
2828
<!-- Begin: Package sources from dotnet-emsdk -->
2929
<!-- End: Package sources from dotnet-emsdk -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<add key="darc-pub-DotNet-msbuild-Trusted-fc19b05" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-fc19b051/nuget/v3/index.json" />
31+
<add key="darc-pub-DotNet-msbuild-Trusted-18a02f8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-18a02f8a/nuget/v3/index.json" />
3232
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3333
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3434
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3535
<!-- Begin: Package sources from dotnet-runtime -->
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
3838
<add key="darc-pub-dotnet-templating-bb74178" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-bb74178-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-4/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-bb74178-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-3/nuget/v3/index.json" />
3941
<add key="darc-pub-dotnet-templating-bb74178-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-2/nuget/v3/index.json" />
4042
<add key="darc-pub-dotnet-templating-bb74178-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bb741780-1/nuget/v3/index.json" />
4143
<!-- End: Package sources from dotnet-templating -->

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>78be8cdf4f0bfd93018fd7a87f8282a41d041298</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.4">
72+
<Dependency Name="Microsoft.Build" Version="17.14.7">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
74+
<Sha>18a02f8a6ac183748b41466337dd15a0124b16d4</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.4-preview-25207-08">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.7-preview-25230-05">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
78+
<Sha>18a02f8a6ac183748b41466337dd15a0124b16d4</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.4-preview-25207-08">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.7-preview-25230-05">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
83+
<Sha>18a02f8a6ac183748b41466337dd15a0124b16d4</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25228.3">

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>3</VersionSDKMinor>
9-
<VersionFeature>00</VersionFeature>
9+
<VersionFeature>01</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -182,8 +182,8 @@
182182
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
183183
184184
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
185-
<MicrosoftBuildVersion>17.14.4</MicrosoftBuildVersion>
186-
<MicrosoftBuildLocalizationVersion>17.14.4-preview-25207-08</MicrosoftBuildLocalizationVersion>
185+
<MicrosoftBuildVersion>17.14.7</MicrosoftBuildVersion>
186+
<MicrosoftBuildLocalizationVersion>17.14.7-preview-25230-05</MicrosoftBuildLocalizationVersion>
187187
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
188188
<MinimumVSVersion>17.12</MinimumVSVersion>
189189
</PropertyGroup>

‎src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ Copyright (c) .NET Foundation. All rights reserved.
405405
<!-- To avoid situations where the content is defined twice, if the user defines the JS module explicitly as
406406
a content item, we'll prefer that over the potential item in the None item group
407407
-->
408-
<_JSFileModuleCandidates Include="@(Content)" />
409-
<_JSFileModuleNoneCandidates Include="@(None)" Exclude="@(Content)" />
408+
<_JSFileModuleCandidates Include="@(Content->Distinct())" />
409+
<_JSFileModuleNoneCandidates Include="@(None->Distinct())" Exclude="@(Content)" />
410410
<_JSFileModuleCandidates Include="@(_JSFileModuleNoneCandidates)" />
411411
</ItemGroup>
412412

‎src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ Copyright (c) .NET Foundation. All rights reserved.
676676
</PropertyGroup>
677677

678678
<DefineStaticWebAssets
679-
CandidateAssets="@(Content)"
679+
CandidateAssets="@(Content->Distinct())"
680680
FingerprintCandidates="$(StaticWebAssetsFingerprintContent)"
681681
FingerprintPatterns="@(StaticWebAssetFingerprintPattern)"
682682
RelativePathPattern="wwwroot/**"
@@ -717,10 +717,23 @@ Copyright (c) .NET Foundation. All rights reserved.
717717
<Output TaskParameter="OriginalAssets" ItemName="_OriginalPackageAssets" />
718718
</UpdatePackageStaticWebAssets>
719719

720+
<ItemGroup>
721+
<_AssetsWithoutEndpoints Include="@(_UpdatedPackageAssets)" Exclude="@(StaticWebAssetEndpoint->'%(AssetFile)')" />
722+
</ItemGroup>
723+
724+
<DefineStaticWebAssetEndpoints
725+
CandidateAssets="@(_AssetsWithoutEndpoints)"
726+
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
727+
>
728+
<Output TaskParameter="Endpoints" ItemName="_UpdatedPackageAssetsEndpoint" />
729+
</DefineStaticWebAssetEndpoints>
730+
720731
<ItemGroup>
721732
<StaticWebAsset Remove="@(_OriginalPackageAssets)"/>
722733
<StaticWebAsset Include="@(_UpdatedPackageAssets)" />
734+
<StaticWebAssetEndpoint Include="@(_UpdatedPackageAssetsEndpoint)" />
723735
</ItemGroup>
736+
724737
</Target>
725738

726739
<Import Project="Microsoft.NET.Sdk.StaticWebAssets.Publish.targets" />

‎src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2626
<!-- Removing the tooling artifacts from all other globs and adding it to the none glob. This ensures that the
2727
up-to-date check is unimpacted by the changes to the tooling artifacts -->
2828
<None Remove="@(_WebToolingArtifacts)" />
29-
<None Include="@(_WebToolingArtifacts)"
29+
<None Include="@(_WebToolingArtifacts->Distinct())"
3030
CopyToOutputDirectory="Never"
3131
CopyToPublishDirectory="Never"
3232
ExcludeFromSingleFile="true" />

0 commit comments

Comments
 (0)