Skip to content

Commit 9b002a2

Browse files
authored
Merge branch 'release/10.0.1xx-preview1' into darc-release/10.0.1xx-preview1-4a7962a0-5613-40c3-a1f3-b1ea9bae515d
2 parents 4a69b80 + 9f59e2c commit 9b002a2

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@
7373
<Sha>3ac196ac425223d11490e759c2641256ce746f21</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25105-03">
76+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25107-06">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>90c5d64f0280e31077a0f395bd328d4a06fb1f36</Sha>
78+
<Sha>a51113d69ff0667528ca5dc8e2775f3c912f2e65</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25105-03">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25107-06">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>90c5d64f0280e31077a0f395bd328d4a06fb1f36</Sha>
82+
<Sha>a51113d69ff0667528ca5dc8e2775f3c912f2e65</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25105-03">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25107-06">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>90c5d64f0280e31077a0f395bd328d4a06fb1f36</Sha>
87+
<Sha>a51113d69ff0667528ca5dc8e2775f3c912f2e65</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25079.4">
@@ -370,22 +370,22 @@
370370
<Sha>3c7e5681f30d0aacc62eda00c7df371d4ed705d9</Sha>
371371
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
372372
</Dependency>
373-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25105.3">
373+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25107.3">
374374
<Uri>https://github.com/dotnet/razor</Uri>
375-
<Sha>f5aebdd0f7e75079d1c5c2b8cb5d5b087cb12c56</Sha>
375+
<Sha>a92927e9e7c4e58109305c60cd4a1e8a5ae137d8</Sha>
376376
</Dependency>
377-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25105.3">
377+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25107.3">
378378
<Uri>https://github.com/dotnet/razor</Uri>
379-
<Sha>f5aebdd0f7e75079d1c5c2b8cb5d5b087cb12c56</Sha>
379+
<Sha>a92927e9e7c4e58109305c60cd4a1e8a5ae137d8</Sha>
380380
</Dependency>
381-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25105.3">
381+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25107.3">
382382
<Uri>https://github.com/dotnet/razor</Uri>
383-
<Sha>f5aebdd0f7e75079d1c5c2b8cb5d5b087cb12c56</Sha>
383+
<Sha>a92927e9e7c4e58109305c60cd4a1e8a5ae137d8</Sha>
384384
</Dependency>
385385
<!-- Intermediate is necessary for source build. -->
386-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25105.3">
386+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25107.3">
387387
<Uri>https://github.com/dotnet/razor</Uri>
388-
<Sha>f5aebdd0f7e75079d1c5c2b8cb5d5b087cb12c56</Sha>
388+
<Sha>a92927e9e7c4e58109305c60cd4a1e8a5ae137d8</Sha>
389389
<SourceBuild RepoName="razor" ManagedOnly="true" />
390390
</Dependency>
391391
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-preview.1.25103.6">

eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@
193193
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
194194
195195
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
196-
<MicrosoftBuildVersion>17.14.0-preview-25105-03</MicrosoftBuildVersion>
197-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25105-03</MicrosoftBuildLocalizationVersion>
196+
<MicrosoftBuildVersion>17.14.0-preview-25107-06</MicrosoftBuildVersion>
197+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25107-06</MicrosoftBuildLocalizationVersion>
198198
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
199199
<MinimumVSVersion>17.12</MinimumVSVersion>
200200
</PropertyGroup>
@@ -245,9 +245,9 @@
245245
</PropertyGroup>
246246
<PropertyGroup>
247247
<!-- Dependencies from https://github.com/dotnet/razor -->
248-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25105.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
249-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25105.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
250-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25105.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
248+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25107.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
249+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25107.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
250+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25107.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
251251
</PropertyGroup>
252252
<PropertyGroup>
253253
<!-- Dependencies from https://github.com/dotnet/wpf -->

src/Cli/Microsoft.DotNet.Cli.Utils/Uuid.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static Guid Create(string name)
2727
Array.Copy(namespaceBytes, streamToHash, namespaceBytes.Length);
2828
Array.Copy(nameBytes, 0, streamToHash, namespaceBytes.Length, nameBytes.Length);
2929

30-
var hashResult = XxHash3.Hash(streamToHash); // This is just used for generating a named pipe so we don't need a cryptographic hash
30+
var hashResult = XxHash128.Hash(streamToHash); // This is just used for generating a named pipe so we don't need a cryptographic hash
3131

3232
var res = new byte[16];
3333

0 commit comments

Comments
 (0)