Skip to content

Commit 899cd0f

Browse files
MiYanniMiYanni
authored
Installer updates (Merge to SDK Changeset) (#17959)
2 parents 94edbe8 + 7295cdf commit 899cd0f

File tree

209 files changed

+1029
-1756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+1029
-1756
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dotnet_style_qualification_for_event = false:suggestion
4141
# only use var when it's obvious what the variable type is
4242
csharp_style_var_for_built_in_types = false:none
4343
csharp_style_var_when_type_is_apparent = false:none
44-
csharp_style_var_elsewhere = false:suggestion
44+
csharp_style_var_elsewhere = false:none
4545

4646
# use language keywords instead of BCL types
4747
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion

‎.gitattributes‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
*.doc diff=astextplain
2-
*.DOC diff=astextplain
3-
*.docx diff=astextplain
4-
*.DOCX diff=astextplain
5-
*.dot diff=astextplain
6-
*.DOT diff=astextplain
7-
*.pdf diff=astextplain
8-
*.PDF diff=astextplain
9-
*.rtf diff=astextplain
10-
*.RTF diff=astextplain
1+
*.doc binary
2+
*.DOC binary
3+
*.docx binary
4+
*.DOCX binary
5+
*.dot binary
6+
*.DOT binary
7+
*.pdf binary
8+
*.PDF binary
9+
*.rtf binary
10+
*.RTF binary
1111

1212
*.jpg binary
1313
*.png binary
@@ -52,4 +52,4 @@
5252
*.fsproj text=auto
5353
*.dbproj text=auto
5454
*.xlf text=auto
55-
*.sln text=auto eol=crlf
55+
*.sln text=auto eol=crlf

‎Directory.Build.props‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project>
3-
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4-
5-
<PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
6-
<Copyright>$(CopyrightNetFoundation)</Copyright>
7-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
8-
</PropertyGroup>
2+
<!-- Platform needs to be set with TreatAsLocalProperty since it is a global property and cannot be overridden otherwise. -->
3+
<Project TreatAsLocalProperty="Platform">
94

105
<PropertyGroup>
116
<BuildArchitecture Condition="'$(BuildArchitecture)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
@@ -14,7 +9,24 @@
149
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
1510
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</Architecture>
1611
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
12+
13+
<!--
14+
The finalizer project needs to have Platform set to build for the correct architecture.
15+
Platform needs to be set prior to calling the Arcade SDK, which sets PlatformName in RepoDefaults.props and modifies the OutputPath in ProjectLayout.props to include a PlatformName folder in the path.
16+
Currently, build.cmd calls run-build.ps1, which always sets the Architecture.
17+
However, if you wanted to build the finalizer project directly, the Architecture will use the logic above to be set properly, and thus maintain the correct OutputPath.
18+
Note: The redist project does use Architecture. The Arcade SDK does not use either BuildArchitecture or Architecture.
19+
-->
20+
<Platform Condition="'$(SetPlatformFromArchitecture)' == 'true' And ('$(Platform)' == '' Or '$(Platform)' == 'AnyCPU')">$(Architecture)</Platform>
1721
</PropertyGroup>
22+
23+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
24+
25+
<PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
26+
<Copyright>$(CopyrightNetFoundation)</Copyright>
27+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
28+
</PropertyGroup>
29+
1830
<PropertyGroup Condition="'$(PgoInstrument)' == 'true'">
1931
<SkipBuildingInstallers>true</SkipBuildingInstallers>
2032
<PgoTerm>-pgo</PgoTerm>

‎Microsoft.DotNet.Cli.sln‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.28603.18
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.8.34112.27
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}"
77
EndProject
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core-
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{78E15EC1-7732-41E3-8591-934E9F583254}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\SdkResolver\SdkResolver.csproj", "{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}"
19-
EndProject
2018
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Internal", "src\Microsoft.Dotnet.Sdk.Internal\Microsoft.Dotnet.Sdk.Internal.csproj", "{73F07908-981B-41BB-B9BD-F3420274A6F7}"
2119
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}"
@@ -45,10 +43,6 @@ Global
4543
{78E15EC1-7732-41E3-8591-934E9F583254}.Debug|Any CPU.Build.0 = Debug|Any CPU
4644
{78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.ActiveCfg = Release|Any CPU
4745
{78E15EC1-7732-41E3-8591-934E9F583254}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0}.Release|Any CPU.Build.0 = Release|Any CPU
5246
{73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5347
{73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
5448
{73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -70,7 +64,6 @@ Global
7064
{1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
7165
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
7266
{78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
73-
{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
7467
{CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
7568
{658EF9BE-452C-4D31-AA24-B9E2235799A8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
7669
EndGlobalSection

‎Native.sln‎

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

‎eng/AfterSigning.targets‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1-
<Project>
1+
<Project>
2+
23
<PropertyGroup>
34
<_SuppressSdkImports>false</_SuppressSdkImports>
45
</PropertyGroup>
56

6-
<Target Name="PopulateGenerateChecksumItems"
7-
AfterTargets="Build"
8-
BeforeTargets="GenerateChecksums" >
9-
7+
<Target Name="PopulateGenerateChecksumItems" AfterTargets="Build" BeforeTargets="GenerateChecksums">
108
<ItemGroup>
119
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.msi" />
1210
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.exe" />
1311
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.zip" Exclude="$(ArtifactsShippingPackagesDir)**\*.wixpack.zip" />
1412
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.tar.gz" />
1513
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.deb" />
1614
<InstallerFiles Include="$(ArtifactsShippingPackagesDir)**\*.rpm" />
17-
<GenerateChecksumItems Include="%(InstallerFiles.Identity)" >
15+
<GenerateChecksumItems Include="%(InstallerFiles.Identity)">
1816
<DestinationPath>%(FullPath).sha512</DestinationPath>
1917
</GenerateChecksumItems>
2018
</ItemGroup>
2119
</Target>
2220

2321
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
22+
2423
</Project>

‎eng/Build.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
<!-- Regular build -->
1313
<ItemGroup>
1414
<ProjectToBuild Include="$(RepoRoot)Microsoft.DotNet.Cli.sln" />
15-
<ProjectToBuild Condition="'$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x86' Or '$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64' Or '$(Architecture)' == 'arm')"
16-
Include="$(RepoRoot)eng\version.csproj;
17-
$(RepoRoot)eng\native.proj" />
15+
<ProjectToBuild Condition="'$(OS)' == 'Windows_NT' And ('$(Architecture)' == 'x86' Or '$(Architecture)' == 'x64' Or '$(Architecture)' == 'arm64')"
16+
Include="$(RepoRoot)src\finalizer\finalizer-build.csproj" />
1817
</ItemGroup>
1918
</Otherwise>
2019
</Choose>

‎eng/ManualVersions.props‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project>
32

4-
<!-- The following properties (unlike those in version.props) are maintained manually. So
5-
when there is a merge conflict, the highest version should generally be chosen, rather
6-
than keeping what's in the branch, which is the usual strategy with version.props merge
7-
conflicts.
8-
9-
Basically: In this file, choose the highest version when resolving merge conflicts.
3+
<!--
4+
The following properties (unlike those in version.props) are maintained manually. So
5+
when there is a merge conflict, the highest version should generally be chosen, rather
6+
than keeping what's in the branch, which is the usual strategy with version.props merge
7+
conflicts.
8+
9+
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
1212
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
@@ -16,4 +16,5 @@
1616
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
1717
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
1818
</PropertyGroup>
19+
1920
</Project>

‎eng/Publishing.props‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,15 @@
8585
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productCommit-*.txt.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false'" />
8686
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)productVersion.txt.sha512" Condition=" '$(OS)' != 'Windows_NT' or '$(Architecture)' != 'x64'" />
8787
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt.sha512" Condition=" '$(OS)' != 'Windows_NT' or '$(Architecture)' != 'x64'" />
88-
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.zip.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' "/>
89-
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.tar.gz.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' "/>
88+
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.zip.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' " />
89+
<CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.tar.gz.sha512" Condition=" '$(PublishBinariesAndBadge)' == 'false' " />
9090
</ItemGroup>
9191

9292
<Target Name="PublishSdkAssetsAndChecksums"
9393
BeforeTargets="Publish"
9494
Condition="$(DotNetPublishUsingPipelines)">
95-
9695
<ReadLinesFromFile File="$(ArtifactsTmpDir)FullNugetVersion.version">
97-
<Output
98-
TaskParameter="Lines"
99-
PropertyName="FullNugetVersion"/>
96+
<Output TaskParameter="Lines" PropertyName="FullNugetVersion" />
10097
</ReadLinesFromFile>
10198

10299
<ItemGroup>

‎eng/Signing.props‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
custom publishing target. And should not be picked up by arcade's default publishing logic. -->
66
<ItemsToSignPostBuild Remove="*.wixpack.zip" />
77
</ItemGroup>
8+
89
<ItemGroup Condition="'$(PostBuildSign)' != 'true'">
910
<ItemsToSign Remove="@(ItemsToSign)" />
1011
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.exe" />
@@ -17,10 +18,7 @@
1718
<ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">3PartySHA2</ExternalCertificateId>
1819
<InternalCertificateId Condition="'$(InternalCertificateId)' == ''">MicrosoftDotNet500</InternalCertificateId>
1920

20-
<!--
21-
Signing of shipping artifacts (layout, msi, bundle) are handled separately.
22-
It is therefore expected that <ItemsToSign> could be an empty set.
23-
-->
21+
<!-- Signing of shipping artifacts (layout, msi, bundle) are handled separately. It is therefore expected that <ItemsToSign> could be an empty set. -->
2422
<AllowEmptySignList>true</AllowEmptySignList>
2523
<AllowEmptySignPostBuildList>true</AllowEmptySignPostBuildList>
2624

@@ -33,6 +31,7 @@
3331
<FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
3432
<FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
3533
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="$(ExternalCertificateId)" />
34+
<FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
3635

3736
<!-- Files in the layout that should not be signed -->
3837
<FileSignInfo Include="apphost.exe" CertificateName="None" />

0 commit comments

Comments
 (0)