mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged PR 30048: [internal/release/7.0.2xx] Merge from public

Browse source 
Merge from public release/7.0.2xx to internal/release/7.0.2xx and resolve conflicts if necessary
This commit is contained in:
Matt Mitchell (.NET) 2023-03-17 16:04:08 +00:00
commit f7de182f41
6 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
eng/Version.Details.xml
View file

@ -85,17 +85,17 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>0385265f4d0b6413d64aea0223172366a9b9858c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.1.0-rc.23115.1">
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.1.0-rc.23166.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>94c498e399eb1cbb7290ed1e42564589a259312a</Sha>
<Sha>08bca9607a6d666039a5a5e66c2179f43fe1a1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.23115.1">
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.23166.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>94c498e399eb1cbb7290ed1e42564589a259312a</Sha>
<Sha>08bca9607a6d666039a5a5e66c2179f43fe1a1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.23115.1">
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.23166.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>94c498e399eb1cbb7290ed1e42564589a259312a</Sha>
<Sha>08bca9607a6d666039a5a5e66c2179f43fe1a1b4</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.203">
@ -198,18 +198,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23122.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2e0fab0209c66d181d93b0d03bc267db5bde75be</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23122.4">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2e0fab0209c66d181d93b0d03bc267db5bde75be</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23122.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2e0fab0209c66d181d93b0d03bc267db5bde75be</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23063.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

16
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23122.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -46,9 +46,9 @@
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.22406.1</MicrosoftDotNetTestProjectTemplates30PackageVersion>
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.1.0-rc.23115.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.23115.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.23115.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
<MicrosoftDotNetTestProjectTemplates50PackageVersion>1.1.0-rc.23166.1</MicrosoftDotNetTestProjectTemplates50PackageVersion>
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.23166.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
<MicrosoftDotNetTestProjectTemplates70PackageVersion>1.1.0-rc.23166.1</MicrosoftDotNetTestProjectTemplates70PackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- NUnit3.DotNetNew.Template versions do not 'flow in' -->
@ -122,8 +122,8 @@
We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
Instead the indicator is that the incoming SDK version is not RTM or greater yet.
-->
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) >= 2">true</SubtractOneFromTemplateVersions>
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) >= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
<AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>
<AspNetCoreTemplateFeature60 Condition="'$(SubtractOneFromTemplateVersions)' == 'true'">$([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1))</AspNetCoreTemplateFeature60>
</PropertyGroup>
@ -215,8 +215,8 @@
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltSDKVersion>7.0.103</PrivateSourceBuiltSDKVersion>
<PrivateSourceBuiltArtifactsPackageVersion>7.0.103</PrivateSourceBuiltArtifactsPackageVersion>
<PrivateSourceBuiltSDKVersion>7.0.104</PrivateSourceBuiltSDKVersion>
<PrivateSourceBuiltArtifactsPackageVersion>7.0.104</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup>
<!-- Workload manifest package versions -->
<PropertyGroup>

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "7.0.103",
"dotnet": "7.0.104",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23122.4"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3"
}
}

2
src/SourceBuild/tarball/content/eng/bootstrap/OverrideBootstrapVersions.props
View file

@ -2,7 +2,7 @@
<PropertyGroup>
<!-- 7.0.0 produced improperly versioned runtime assets because the OfficialBuildId
was not set correctly. This is the actual shipping version that it should have been -->
<NonshippingRuntimeVersionFor700>7.0.0-rtm.22518.5</NonshippingRuntimeVersionFor700>
<NonshippingRuntimeVersionFor700>7.0.4-servicing.23107.6</NonshippingRuntimeVersionFor700>
<MicrosoftNETHostModelVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETHostModelVersion>
<MicrosoftNETCoreTestHostVersion>$(NonshippingRuntimeVersionFor700)</MicrosoftNETCoreTestHostVersion>

2
src/SourceBuild/tarball/content/global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "7.0.103"
"dotnet": "7.0.104"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",

7
src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs
View file

@ -14,13 +14,13 @@ internal class DotNetHelper
{
private static readonly object s_lockObj = new();
private static bool IsMonoRuntime { get; } = DetermineIsMonoRuntime();
public static string DotNetPath { get; } = Path.Combine(Config.DotNetDirectory, "dotnet");
public static string LogsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "logs");
public static string PackagesDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), "packages");
public static string ProjectsDirectory { get; } = Path.Combine(Directory.GetCurrentDirectory(), $"projects-{DateTime.Now:yyyyMMddHHmmssffff}");
private ITestOutputHelper OutputHelper { get; }
private bool IsMonoRuntime { get; }
public DotNetHelper(ITestOutputHelper outputHelper)
{
@ -38,6 +38,7 @@ internal class DotNetHelper
Directory.CreateDirectory(Config.DotNetDirectory);
ExecuteHelper.ExecuteProcessValidateExitCode("tar", $"xzf {Config.SdkTarballPath} -C {Config.DotNetDirectory}", outputHelper);
}
IsMonoRuntime = DetermineIsMonoRuntime(Config.DotNetDirectory);
if (!Directory.Exists(ProjectsDirectory))
{
@ -234,10 +235,8 @@ internal class DotNetHelper
return $"/bl:{Path.Combine(LogsDirectory, $"{fileName}.binlog")}";
}
private static bool DetermineIsMonoRuntime()
private static bool DetermineIsMonoRuntime(string dotnetRoot)
{
string dotnetRoot = Config.DotNetDirectory;
string sharedFrameworkRoot = Path.Combine(dotnetRoot, "shared", "Microsoft.NETCore.App");
if (!Directory.Exists(sharedFrameworkRoot))
{