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

Merge branch 'release/7.0.3xx' into release/7.0.4xx

Browse source
This commit is contained in:
Jason Zhai 2023-04-06 22:56:35 -07:00
commit c7f02420a1
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -98,22 +98,22 @@
<Sha>5a41781eb69eb4721e736a99262dbd32b6bb55d4</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300-preview.23203.7">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.300-preview.23204.25">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>bc516e3febc26661c9c35e756abe8d3ebb1f11e5</Sha>
<Sha>f926985763ae5c226cf59cd0cac8a09f38ce300d</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-preview.23203.7">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.300-preview.23204.25">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>bc516e3febc26661c9c35e756abe8d3ebb1f11e5</Sha>
<Sha>f926985763ae5c226cf59cd0cac8a09f38ce300d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-preview.23203.7">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.300-preview.23204.25">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>bc516e3febc26661c9c35e756abe8d3ebb1f11e5</Sha>
<Sha>f926985763ae5c226cf59cd0cac8a09f38ce300d</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-preview.23203.7">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.300-preview.23204.25">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>bc516e3febc26661c9c35e756abe8d3ebb1f11e5</Sha>
<Sha>f926985763ae5c226cf59cd0cac8a09f38ce300d</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.4-servicing.23117.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

6
eng/Versions.props
View file

@ -69,9 +69,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300-preview.23203.7</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.300-preview.23203.7</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-preview.23203.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.300-preview.23204.25</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.300-preview.23204.25</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.300-preview.23204.25</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

3
src/SourceBuild/tarball/content/repos/Directory.Build.targets
View file

@ -376,6 +376,9 @@
DependsOnTargets="BuildRepoReferences"
Inputs="$(MSBuildProjectFullPath)"
Outputs="$(RepoCompletedSemaphorePath)Build.complete">
<Exec Command="$(DotnetToolCommand) build-server shutdown" />
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Building $(ProjectBuildReason)" />
<Message Importance="High" Text="Running command:" />
<Message Importance="High" Text=" $(BuildCommand) $(RepoApiArgs)" Condition="'$(BuildCommand)' != ''" />