Skip to content

Commit 817794e

Browse files
MichaelSimonsMichaelSimons
committed
Merge branch 'release/7.0.1xx' of https://github.com/dotnet/installer into internal-merge-7.0.1xx-2022-11-08-1117
2 parents 66a2e7c + 842d575 commit 817794e

File tree

11 files changed

+43
-73
lines changed

11 files changed

+43
-73
lines changed

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,18 @@
188188
</Dependency>
189189
</ProductDependencies>
190190
<ToolsetDependencies>
191-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22513.4">
191+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
192192
<Uri>https://github.com/dotnet/arcade</Uri>
193-
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
193+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
194194
<SourceBuild RepoName="arcade" ManagedOnly="true" />
195195
</Dependency>
196-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22513.4">
196+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22558.4">
197197
<Uri>https://github.com/dotnet/arcade</Uri>
198-
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
198+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
199199
</Dependency>
200-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22513.4">
200+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22558.4">
201201
<Uri>https://github.com/dotnet/arcade</Uri>
202-
<Sha>02e28316bf35d1028683ee313f0794776bff18d1</Sha>
202+
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
203203
</Dependency>
204204
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22514.1">
205205
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</PropertyGroup>
2828
<PropertyGroup>
2929
<!-- Dependency from https://github.com/dotnet/arcade -->
30-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22513.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
30+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22558.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
3131
</PropertyGroup>
3232
<PropertyGroup>
3333
<!-- Dependency from https://github.com/dotnet/winforms -->
@@ -193,17 +193,17 @@
193193
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
194194
necessary, and this property is removed from the file.
195195
-->
196-
<PrivateSourceBuiltArtifactsPackageVersion>7.0.100-rc.2</PrivateSourceBuiltArtifactsPackageVersion>
196+
<PrivateSourceBuiltArtifactsPackageVersion>7.0.100</PrivateSourceBuiltArtifactsPackageVersion>
197197
</PropertyGroup>
198198
<!-- Workload manifest package versions -->
199199
<PropertyGroup>
200-
<MauiFeatureBand>7.0.100-rc.1</MauiFeatureBand>
201-
<MauiWorkloadManifestVersion>7.0.0-rc.1.6430</MauiWorkloadManifestVersion>
202-
<XamarinAndroidWorkloadManifestVersion>33.0.0-rc.1.136</XamarinAndroidWorkloadManifestVersion>
203-
<XamarinIOSWorkloadManifestVersion>15.4.1006-rc.1</XamarinIOSWorkloadManifestVersion>
204-
<XamarinMacCatalystWorkloadManifestVersion>15.4.1006-rc.1</XamarinMacCatalystWorkloadManifestVersion>
205-
<XamarinMacOSWorkloadManifestVersion>12.3.1006-rc.1</XamarinMacOSWorkloadManifestVersion>
206-
<XamarinTvOSWorkloadManifestVersion>15.4.1006-rc.1</XamarinTvOSWorkloadManifestVersion>
200+
<MauiFeatureBand>7.0.100</MauiFeatureBand>
201+
<MauiWorkloadManifestVersion>7.0.49</MauiWorkloadManifestVersion>
202+
<XamarinAndroidWorkloadManifestVersion>33.0.4</XamarinAndroidWorkloadManifestVersion>
203+
<XamarinIOSWorkloadManifestVersion>16.0.1478</XamarinIOSWorkloadManifestVersion>
204+
<XamarinMacCatalystWorkloadManifestVersion>15.4.2372</XamarinMacCatalystWorkloadManifestVersion>
205+
<XamarinMacOSWorkloadManifestVersion>12.3.2372</XamarinMacOSWorkloadManifestVersion>
206+
<XamarinTvOSWorkloadManifestVersion>16.0.1478</XamarinTvOSWorkloadManifestVersion>
207207
<MonoWorkloadManifestVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MonoWorkloadManifestVersion>
208208
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
209209
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>

‎eng/source-build-tarball-build-official.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ resources:
1010
- main
1111
- release/*
1212
- internal/release/*
13+
exclude:
14+
- release/6.0.3xx
15+
- internal/release/6.0.3xx
16+
- release/6.0.4xx
17+
- internal/release/6.0.4xx
1318
stages:
1419
- build
1520

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.100-rc.2.22477.23",
3+
"dotnet": "7.0.100",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@@ -11,7 +11,7 @@
1111
"cmake": "3.16.4"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22513.4",
15-
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22513.4"
14+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4",
15+
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22558.4"
1616
}
1717
}

‎src/SourceBuild/tarball/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": "7.0.100-rc.2.22477.23"
3+
"dotnet": "7.0.100"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

‎src/SourceBuild/tarball/content/repos/Directory.Build.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@
8585
NewText="/p:RepoRoot=&quot;$repo_root/&quot;" />
8686
</Target>
8787

88-
<Target Name="AddCommonNoWarns"
88+
<Target Name="AddNoWarns"
8989
BeforeTargets="Build"
9090
Condition=" EXISTS('$(ProjectDirectory)Directory.Build.props') OR EXISTS('$(ProjectDirectory)src/Directory.Build.props') "
9191
Inputs="$(MSBuildProjectFullPath)"
92-
Outputs="$(RepoCompletedSemaphorePath)AddCommonNoWarns.complete" >
92+
Outputs="$(RepoCompletedSemaphorePath)AddNoWarns.complete" >
9393

9494
<!-- Don't warn on warnings that can be generated in source-build
9595
but not necessarily in repo builds.
@@ -104,7 +104,7 @@
104104
<OldText><![CDATA[</Project>]]></OldText>
105105
<NewText>
106106
<![CDATA[ <PropertyGroup>
107-
<NoWarn>%24(NoWarn);NU5104;NU1603</NoWarn>
107+
<NoWarn>%24(NoWarn);NU5104;NU1603;$(RepoNoWarns)</NoWarn>
108108
</PropertyGroup>
109109
</Project>]]>
110110
</NewText>

‎src/SourceBuild/tarball/content/repos/aspnetcore.proj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121

2222
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
2323
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
24+
25+
<!-- CS0618 - Caused from deprecated IOperation.Children in
26+
Microsoft.CodeAnalysis 4.3.0, but aspnetcore references version 4.2.0.
27+
Requires https://github.com/dotnet/source-build/issues/2482 -->
28+
<RepoNoWarns>CS0618</RepoNoWarns>
2429
</PropertyGroup>
2530

2631
<ItemGroup>

‎src/SourceBuild/tarball/content/repos/razor-compiler.proj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
88
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
99
<OutputPlacementRepoApiImplemented>false</OutputPlacementRepoApiImplemented>
10+
11+
<!-- NU1507 - https://github.com/dotnet/razor-compiler/issues/242
12+
Occurs when using NuGet central package management without defining any Package Source Mappings. -->
13+
<RepoNoWarns>NU1507</RepoNoWarns>
1014
</PropertyGroup>
1115

1216
<ItemGroup>

‎src/SourceBuild/tarball/patches/aspnetcore/0001-Disable-warning-CS0618.patch‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/SourceBuild/tarball/patches/razor-compiler/0001-Add-NoWarn-for-NU1507.patch‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)