Skip to content

Commit ad154d6

Browse files
ViktorHoferViktorHofer
authored
Merge redist installer with redist (#47659)
1 parent a0ebb7a commit ad154d6

File tree

93 files changed

+126
-180
lines changed

Some content is hidden

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

93 files changed

+126
-180
lines changed

‎eng/Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
it depends on assets from other verticals that are built in the first build pass. -->
1414
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
1515
'$(OS)' == 'Windows_NT'">
16-
<ProjectToBuild Include="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
16+
<ProjectToBuild Include="$(RepoRoot)src\Layout\redist\redist.csproj" DotNetBuildPass="2" />
1717
</ItemGroup>
1818

1919
</Project>

‎eng/Publishing.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<Target Name="GetNonStableProductVersion">
3838
<!-- Retrieve the non-stable product version. -->
39-
<MSBuild Projects="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj"
39+
<MSBuild Projects="$(RepoRoot)src\Layout\redist\redist.csproj"
4040
Targets="ReturnProductVersion">
4141
<Output TaskParameter="TargetOutputs" PropertyName="NonStableProductVersion" />
4242
</MSBuild>

‎eng/Version.Details.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<Sha>79edb640661c29fc3917eac0a6f06e908f4cf617</Sha>
8686
<SourceBuild RepoName="runtime" ManagedOnly="false" />
8787
</Dependency>
88-
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
88+
<!-- Change blob version in GenerateInstallerLayout.targets if this is unpinned to service targeting pack -->
8989
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
9090
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
9191
<Uri>https://github.com/dotnet/core-setup</Uri>

‎sdk.sln‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-format.UnitTests", "
485485
EndProject
486486
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer", "src\Layout\finalizer\finalizer.csproj", "{32DA04FF-A951-43EA-B2FA-86A825009A97}"
487487
EndProject
488-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Layout\redist-installer\redist-installer.proj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
489-
EndProject
490488
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-sdk", "src\Layout\pkg\dotnet-sdk.proj", "{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}"
491489
EndProject
492490
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VS.Redist.Common.Net.Core.SDK.VSTemplateLocator", "src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
@@ -945,10 +943,6 @@ Global
945943
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Debug|Any CPU.Build.0 = Debug|Any CPU
946944
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.ActiveCfg = Release|Any CPU
947945
{32DA04FF-A951-43EA-B2FA-86A825009A97}.Release|Any CPU.Build.0 = Release|Any CPU
948-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
949-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.Build.0 = Debug|Any CPU
950-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.ActiveCfg = Release|Any CPU
951-
{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.Build.0 = Release|Any CPU
952946
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
953947
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Debug|Any CPU.Build.0 = Debug|Any CPU
954948
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1184,7 +1178,6 @@ Global
11841178
{85A01ACB-CC90-45EF-8F6C-AFC2B9F31126} = {3AD322BF-405B-4A53-9858-51CF66E8509F}
11851179
{7382A1CB-AA9A-4136-A548-17D7A67C6B0C} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11861180
{D7495CE7-64E5-4715-9304-799A41EC1D71} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
1187-
{FAADC193-BA41-449D-97CE-0EF82836046A} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
11881181
{8D6A9984-118D-4415-A8FA-AB1F26CF5C44} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
11891182
{0CBA5FB8-71A3-457A-89F3-E52B9602164A} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
11901183
{21C21975-84C1-4A24-8E21-F7EC790A4584} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}

‎source-build.slnf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"src\\Compatibility\\Microsoft.DotNet.ApiSymbolExtensions\\Microsoft.DotNet.ApiSymbolExtensions.csproj",
2121
"src\\Containers\\Microsoft.NET.Build.Containers\\Microsoft.NET.Build.Containers.csproj",
2222
"src\\Containers\\packaging\\package.csproj",
23-
"src\\Layout\\redist-installer\\redist-installer.proj",
2423
"src\\Layout\\pkg\\dotnet-sdk.proj",
2524
"src\\Layout\\redist\\redist.csproj",
2625
"src\\Layout\\redist\\tools\\tool_fsc.csproj",

‎src/Layout/Directory.Build.props‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<ExeExtension Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))"></ExeExtension>
3232

3333
<Rid>$(OSName)-$(Architecture)</Rid>
34-
<ProductMonikerRid Condition="'$(ProductMonikerRid)' == ''">$(Rid)</ProductMonikerRid>
34+
<ProductMonikerRid>$(Rid)</ProductMonikerRid>
3535

3636
<PortableOSName Condition="'$(PortableOSName)' == ''">$(OSName)</PortableOSName>
3737
<PortableRid>$(PortableOSName)-$(Architecture)</PortableRid>
38-
<PortableProductMonikerRid Condition="'$(PortableProductMonikerRid)' == ''">$(PortableRid)</PortableProductMonikerRid>
38+
<PortableProductMonikerRid>$(PortableRid)</PortableProductMonikerRid>
3939
</PropertyGroup>
4040

4141
<PropertyGroup>
@@ -69,4 +69,8 @@
6969
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-$(Architecture)</SharedFrameworkRid>
7070
</PropertyGroup>
7171

72+
<PropertyGroup>
73+
<SdkPkgSourcesRootDirectory>$(MSBuildThisFileDirectory)pkg\</SdkPkgSourcesRootDirectory>
74+
</PropertyGroup>
75+
7276
</Project>

‎src/Layout/Directory.Build.targets‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
1010
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)</SdkOutputDirectory>
1111

12-
<RedistInstallerLayoutPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\dotnet\</RedistInstallerLayoutPath>
13-
<SdkInternalLayoutPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\i\</SdkInternalLayoutPath>
12+
<RedistInstallerBaseOutputPath>$(ArtifactsBinDir)redist-installer\$(Configuration)\</RedistInstallerBaseOutputPath>
13+
<RedistInstallerLayoutPath>$(RedistInstallerBaseOutputPath)dotnet\</RedistInstallerLayoutPath>
14+
<SdkInternalLayoutPath>$(RedistInstallerBaseOutputPath)i\</SdkInternalLayoutPath>
1415
<InstallerOutputDirectory>$(RedistInstallerLayoutPath)sdk\$(Version)\</InstallerOutputDirectory>
1516
</PropertyGroup>
1617

‎src/Layout/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers/VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<ProjectReference Include="$(RepoRoot)src\Microsoft.Net.Sdk.AnalyzerRedirecting\Microsoft.Net.Sdk.AnalyzerRedirecting.csproj" />
15-
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
15+
<ProjectReference Include="..\redist\redist.csproj" />
1616
</ItemGroup>
1717

1818
<!-- Shared infra to build and use the sdk-tasks -->

‎src/Layout/VS.Redist.Common.NetCore.SdkPlaceholder/VS.Redist.Common.NetCore.SdkPlaceholder.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
15+
<ProjectReference Include="..\redist\redist.csproj" />
1616
</ItemGroup>
1717

1818
<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">

‎src/Layout/VS.Redist.Common.NetCore.Templates/VS.Redist.Common.NetCore.Templates.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\redist-installer\redist-installer.proj" />
15+
<ProjectReference Include="..\redist\redist.csproj" />
1616
</ItemGroup>
1717

1818
<Target Name="GenerateLayout" Condition="'$(IsPackable)' == 'true'" DependsOnTargets="ResolveProjectReferences">

0 commit comments

Comments
 (0)