Skip to content

Commit b49087f

Browse files
siriaksiriak
authored
Merge branch 'main' into patch-2
2 parents 4bcd02e + fbcdd41 commit b49087f

File tree

10 files changed

+85
-39
lines changed

10 files changed

+85
-39
lines changed

‎eng/Version.Details.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -52,34 +52,34 @@
5252
<Uri>https://github.com/dotnet/runtime</Uri>
5353
<Sha>958b1e046cbfff5c0bc647f531b4fcf9eb197a6c</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
55+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
5656
<Uri>https://github.com/dotnet/aspnetcore</Uri>
57-
<Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
57+
<Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
59+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
6060
<Uri>https://github.com/dotnet/aspnetcore</Uri>
61-
<Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
61+
<Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
63+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
6464
<Uri>https://github.com/dotnet/aspnetcore</Uri>
65-
<Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
65+
<Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
6666
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
6767
</Dependency>
68-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
68+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
6969
<Uri>https://github.com/dotnet/aspnetcore</Uri>
70-
<Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
70+
<Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
7171
</Dependency>
72-
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
72+
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
7373
<Uri>https://github.com/dotnet/aspnetcore</Uri>
74-
<Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
74+
<Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
7575
</Dependency>
76-
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
76+
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
7777
<Uri>https://github.com/dotnet/aspnetcore</Uri>
78-
<Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
78+
<Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
7979
</Dependency>
80-
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.4.23205.3" CoherentParentDependency="Microsoft.NET.Sdk">
80+
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.4.23205.4" CoherentParentDependency="Microsoft.NET.Sdk">
8181
<Uri>https://github.com/dotnet/aspnetcore</Uri>
82-
<Sha>acdfabbc111dee9ad3e5dbbea9e3c026c3b562b1</Sha>
82+
<Sha>dce793fda55ebc9b32eb69ff01023a618ed06942</Sha>
8383
</Dependency>
8484
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
8585
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -102,22 +102,22 @@
102102
<Uri>https://github.com/dotnet/test-templates</Uri>
103103
<Sha>5a41781eb69eb4721e736a99262dbd32b6bb55d4</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23205.14">
105+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23206.6">
106106
<Uri>https://github.com/dotnet/sdk</Uri>
107-
<Sha>96f4e06b4d579146332607aa2fe83113e24efaa4</Sha>
107+
<Sha>14ef05cb4b32d24cb062017f9ac1ebf6110257e6</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23205.14">
109+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23206.6">
110110
<Uri>https://github.com/dotnet/sdk</Uri>
111-
<Sha>96f4e06b4d579146332607aa2fe83113e24efaa4</Sha>
111+
<Sha>14ef05cb4b32d24cb062017f9ac1ebf6110257e6</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23205.14">
113+
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23206.6">
114114
<Uri>https://github.com/dotnet/sdk</Uri>
115-
<Sha>96f4e06b4d579146332607aa2fe83113e24efaa4</Sha>
115+
<Sha>14ef05cb4b32d24cb062017f9ac1ebf6110257e6</Sha>
116116
<SourceBuild RepoName="sdk" ManagedOnly="true" />
117117
</Dependency>
118-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23205.14">
118+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23206.6">
119119
<Uri>https://github.com/dotnet/sdk</Uri>
120-
<Sha>96f4e06b4d579146332607aa2fe83113e24efaa4</Sha>
120+
<Sha>14ef05cb4b32d24cb062017f9ac1ebf6110257e6</Sha>
121121
</Dependency>
122122
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
123123
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.4.23177.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -181,9 +181,9 @@
181181
<Sha>b60c95e1ce736630d17e16626c59e3dd85ebae2b</Sha>
182182
<SourceBuild RepoName="deployment-tools" ManagedOnly="true" />
183183
</Dependency>
184-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23178.2">
184+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23203.1">
185185
<Uri>https://github.com/dotnet/source-build-externals</Uri>
186-
<Sha>cbd9d61c5a92d7e4a0548a2c8ff4d1a28aaf6379</Sha>
186+
<Sha>33edde07d61cf7606d76ada765335fb81f1cbb71</Sha>
187187
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
188188
</Dependency>
189189
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-22503-02">
@@ -218,9 +218,9 @@
218218
<Uri>https://github.com/dotnet/runtime</Uri>
219219
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
220220
</Dependency>
221-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23205.5">
221+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23206.4">
222222
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
223-
<Sha>09c4d8e93c5b78897bccb4f27e0c373647fb3985</Sha>
223+
<Sha>78ac065ec8e1c310df94c21518371b09aec00073</Sha>
224224
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
225225
</Dependency>
226226
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23175-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

‎eng/Versions.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@
6565
</PropertyGroup>
6666
<PropertyGroup>
6767
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
68-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23205.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
69-
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.4.23205.3</MicrosoftAspNetCoreAppRefPackageVersion>
70-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.4.23205.3</MicrosoftAspNetCoreAppRefInternalPackageVersion>
71-
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23205.3</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
72-
<dotnetdevcertsPackageVersion>8.0.0-preview.4.23205.3</dotnetdevcertsPackageVersion>
73-
<dotnetuserjwtsPackageVersion>8.0.0-preview.4.23205.3</dotnetuserjwtsPackageVersion>
74-
<dotnetusersecretsPackageVersion>8.0.0-preview.4.23205.3</dotnetusersecretsPackageVersion>
68+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.4.23205.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
69+
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.4.23205.4</MicrosoftAspNetCoreAppRefPackageVersion>
70+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.4.23205.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
71+
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.4.23205.4</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
72+
<dotnetdevcertsPackageVersion>8.0.0-preview.4.23205.4</dotnetdevcertsPackageVersion>
73+
<dotnetuserjwtsPackageVersion>8.0.0-preview.4.23205.4</dotnetuserjwtsPackageVersion>
74+
<dotnetusersecretsPackageVersion>8.0.0-preview.4.23205.4</dotnetusersecretsPackageVersion>
7575
</PropertyGroup>
7676
<PropertyGroup>
7777
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
7878
</PropertyGroup>
7979
<PropertyGroup>
8080
<!-- Dependencies from https://github.com/dotnet/sdk -->
81-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23205.14</MicrosoftDotNetCommonItemTemplatesPackageVersion>
82-
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23205.14</MicrosoftNETSdkPackageVersion>
83-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23205.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
81+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23206.6</MicrosoftDotNetCommonItemTemplatesPackageVersion>
82+
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23206.6</MicrosoftNETSdkPackageVersion>
83+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23206.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
8484
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
8585
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
8686
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

‎src/SourceBuild/content/eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
These URLs can't be composed from their base URL and version as we read them from the
1919
prep.sh and pipeline scripts, outside of MSBuild.
2020
-->
21-
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.2.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
21+
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.3.23178.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
2222
<PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-8.0.100-17.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
23-
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.2.23158.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
23+
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.3.23178.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
2424
</PropertyGroup>
2525
</Project>

‎src/SourceBuild/content/global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.100-preview.2.23157.25"
3+
"dotnet": "8.0.100-preview.3.23178.7"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎src/SourceBuild/content/repo-projects/source-build-externals.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
6+
<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
67
</PropertyGroup>
78

89
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

‎src/SourceBuild/content/repo-projects/symreader.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
6+
<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
67
</PropertyGroup>
78

89
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

‎src/SourceBuild/content/repo-projects/xdt.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
88

99
<LogVerbosityOptOut>true</LogVerbosityOptOut>
10+
<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

‎src/SourceBuild/content/repo-projects/xliff-tasks.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<DeterministicBuildOptOut>true</DeterministicBuildOptOut>
99
<IsToolingProject>true</IsToolingProject>
10+
<PackageVersionPropsFlowType>DependenciesOnly</PackageVersionPropsFlowType>
1011
</PropertyGroup>
1112

1213
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

‎src/SourceBuild/patches/roslyn/0001-Only-pack-the-shipping-non-shipping-nupkgs-for-rosly.patch‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nikola Milosavljevic <[email protected]>
3+
Date: Thu, 6 Apr 2023 19:53:04 +0000
4+
Subject: [PATCH] Only pack the shipping/non-shipping nupkgs for roslyn
5+
6+
Avoid packing release, pre-release stable nupkgs, and symbol nupkg.
7+
8+
Backport: https://github.com/dotnet/roslyn/pull/67679
9+
---
10+
eng/SourceBuild.props | 13 +++++++++++++
11+
1 file changed, 13 insertions(+)
12+
13+
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
14+
index d5d41e7167e..a8b55f352ad 100644
15+
--- a/eng/SourceBuild.props
16+
+++ b/eng/SourceBuild.props
17+
@@ -4,8 +4,21 @@
18+
<GitHubRepositoryName>roslyn</GitHubRepositoryName>
19+
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
20+
<SourceBuildTrimNetFrameworkTargets>true</SourceBuildTrimNetFrameworkTargets>
21+
+ <!-- Roslyn produces stable release branded and stable pre-release branded artifacts in addition to the normal non-stable artifacts.
22+
+ Only the non-stable artifacts should flow downstream in source build -->
23+
+ <EnableDefaultSourceBuildIntermediateItems>false</EnableDefaultSourceBuildIntermediateItems>
24+
</PropertyGroup>
25+
26+
+ <Target Name="GetCustomIntermediateNupkgContents" BeforeTargets="GetCategorizedIntermediateNupkgContents">
27+
+ <ItemGroup>
28+
+ <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)Shipping\**\*.nupkg" />
29+
+ <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)NonShipping\**\*.nupkg" />
30+
+ <!-- Don't pack any symbol packages: not needed for downstream source-build CI.
31+
+ Roslyn's symbol packages come in .Symbols.<version>.nupkg instead of the standard format. -->
32+
+ <IntermediateNupkgArtifactFile Remove="$(CurrentRepoSourceBuildArtifactsPackagesDir)**\*.Symbols.*.nupkg" />
33+
+ </ItemGroup>
34+
+ </Target>
35+
+
36+
<!--
37+
The build script passes in the full path of the sln to build. This must be overridden in order to build
38+
the cloned source in the inner build.

‎src/redist/targets/GenerateBundledVersions.targets‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,10 @@ Copyright (c) .NET Foundation. All rights reserved.
405405
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
406406
TargetFramework="net8.0"
407407
ILLinkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
408+
409+
<KnownWebAssemblySdkPack Include="Microsoft.NET.Sdk.WebAssembly.Pack"
410+
TargetFramework="net8.0"
411+
WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
408412
409413
<KnownRuntimePack Include="Microsoft.NETCore.App"
410414
TargetFramework="net8.0"

0 commit comments

Comments
 (0)