Skip to content

Commit

Permalink
[installer] Sync a912b6f → 2f4ab1a
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-maestro[bot] committed Dec 28, 2023
1 parent 5a035c6 commit 07d57b0
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion Components.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ To enable full offline source-building of the VMR, we have no other choice than
- `src/fsharp`
*[dotnet/fsharp@0c48954](https://github.com/dotnet/fsharp/tree/0c489541068f311e23b582410c1df3ff86f1d526)*
- `src/installer`
*[dotnet/installer@a912b6f](https://github.com/dotnet/installer/tree/a912b6f087dccdca175955b75b9e1bb35671670b)*
*[dotnet/installer@2f4ab1a](https://github.com/dotnet/installer/tree/2f4ab1a6c6f9cefbe4009e0836b8babcbe72bb69)*
- `src/msbuild`
*[dotnet/msbuild@5cf7858](https://github.com/dotnet/msbuild/tree/5cf78584f998e524374758c5798b7054bf2595e9)*
- `src/nuget-client`
Expand Down
2 changes: 1 addition & 1 deletion prereqs/git-info/AllRepoVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<formatOutputPackageVersion>9.0.461803</formatOutputPackageVersion>
<fsharpGitCommitHash>0c489541068f311e23b582410c1df3ff86f1d526</fsharpGitCommitHash>
<fsharpOutputPackageVersion>8.0.200-beta.23618.1</fsharpOutputPackageVersion>
<installerGitCommitHash>a912b6f087dccdca175955b75b9e1bb35671670b</installerGitCommitHash>
<installerGitCommitHash>2f4ab1a6c6f9cefbe4009e0836b8babcbe72bb69</installerGitCommitHash>
<installerOutputPackageVersion>9.0.100</installerOutputPackageVersion>
<msbuildGitCommitHash>5cf78584f998e524374758c5798b7054bf2595e9</msbuildGitCommitHash>
<msbuildOutputPackageVersion>17.10.0-preview-23619-02</msbuildOutputPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion prereqs/git-info/installer.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<GitCommitHash>a912b6f087dccdca175955b75b9e1bb35671670b</GitCommitHash>
<GitCommitHash>2f4ab1a6c6f9cefbe4009e0836b8babcbe72bb69</GitCommitHash>
<OfficialBuildId>20231228.1</OfficialBuildId>
<OutputPackageVersion>9.0.100</OutputPackageVersion>
<PreReleaseVersionLabel></PreReleaseVersionLabel>
Expand Down
52 changes: 26 additions & 26 deletions src/installer/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,36 +21,36 @@
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>6ae150796983c8d5bb33e3e3cde3ef7d3056c67a</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23621.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-alpha.1.23627.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0cf461b302f58c7add3f6dc405873fb2212b513f</Sha>
<Sha>8121f82d7d46118eef03a99eecbde64d8021cec7</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23621.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-alpha.1.23627.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0cf461b302f58c7add3f6dc405873fb2212b513f</Sha>
<Sha>8121f82d7d46118eef03a99eecbde64d8021cec7</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-alpha.1.23621.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-alpha.1.23627.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0cf461b302f58c7add3f6dc405873fb2212b513f</Sha>
<Sha>8121f82d7d46118eef03a99eecbde64d8021cec7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23621.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-alpha.1.23627.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0cf461b302f58c7add3f6dc405873fb2212b513f</Sha>
<Sha>8121f82d7d46118eef03a99eecbde64d8021cec7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23621.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-alpha.1.23627.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0cf461b302f58c7add3f6dc405873fb2212b513f</Sha>
<Sha>8121f82d7d46118eef03a99eecbde64d8021cec7</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23621.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-alpha.1.23627.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0cf461b302f58c7add3f6dc405873fb2212b513f</Sha>
<Sha>8121f82d7d46118eef03a99eecbde64d8021cec7</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-alpha.1.23620.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
Expand Down Expand Up @@ -81,22 +81,22 @@
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4b7810723c27d47cc982055c6615cccf664e2980</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-alpha.1.23627.1">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-alpha.1.23627.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4</Sha>
<Sha>20610aa14f6f313894bd9292386447209cc7025c</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-alpha.1.23627.1">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-alpha.1.23627.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4</Sha>
<Sha>20610aa14f6f313894bd9292386447209cc7025c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-alpha.1.23627.1">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-alpha.1.23627.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4</Sha>
<Sha>20610aa14f6f313894bd9292386447209cc7025c</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-alpha.1.23627.1">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-alpha.1.23627.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e27af4c8af767dc9ea8d9c29c8d57a1a8fc976c4</Sha>
<Sha>20610aa14f6f313894bd9292386447209cc7025c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand Down Expand Up @@ -146,23 +146,23 @@
<Sha>f33b3e4ec550c48607057bf051574c048d3ef7b6</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23621.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-alpha.1.23627.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0cf461b302f58c7add3f6dc405873fb2212b513f</Sha>
<Sha>8121f82d7d46118eef03a99eecbde64d8021cec7</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23621.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.9.0-3.23627.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>182e829faf57b84150a2b28036f20918f368fc9d</Sha>
<Sha>072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.10.0-preview-23619-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>5cf78584f998e524374758c5798b7054bf2595e9</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.67" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.9.0-preview.1.69" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>95f6e0c8b7bd627862a08dcf60f43397f42723ca</Sha>
<Sha>0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
Expand Down
22 changes: 11 additions & 11 deletions src/installer/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -86,28 +86,28 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.23627.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-alpha.1.23627.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-alpha.1.23627.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-alpha.1.23627.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-alpha.1.23627.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-alpha.1.23627.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.9.0-3.23621.4</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.9.0-3.23627.3</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-alpha.1.23621.6</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-alpha.1.23627.5</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23621.6</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-alpha.1.23621.6</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23621.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-alpha.1.23621.6</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23621.6</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-alpha.1.23627.5</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-alpha.1.23627.5</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-alpha.1.23627.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-alpha.1.23627.5</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-alpha.1.23627.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
Expand All @@ -128,7 +128,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetBuildTasksPackageVersion>6.9.0-preview.1.67</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>6.9.0-preview.1.69</NuGetBuildTasksPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/source-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"packageVersion": "9.0.100",
"path": "installer",
"remoteUri": "https://github.com/dotnet/installer",
"commitSha": "a912b6f087dccdca175955b75b9e1bb35671670b"
"commitSha": "2f4ab1a6c6f9cefbe4009e0836b8babcbe72bb69"
},
{
"packageVersion": "17.10.0-preview-23619-02",
Expand Down

0 comments on commit 07d57b0

Please sign in to comment.