Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<!-- Platform needs to be set with TreatAsLocalProperty since it is a global property and cannot be overridden otherwise. -->
<Project TreatAsLocalProperty="Platform">

Expand Down
5 changes: 2 additions & 3 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<PropertyGroup>
<!--
Disable nullable warnings when targeting anything other than our supported .NET core version(s).
Expand Down Expand Up @@ -87,7 +86,7 @@
<PackageDescription>
$(PackageDescription)

The source code included in this package is subject to arbitrary changes in future versions.
The source code included in this package is subject to arbitrary changes in future versions.
Updating a reference to this package to a newer version of the package may require changes in the referencing project.
No compatibility guarantees are provided.
</PackageDescription>
Expand Down
8 changes: 4 additions & 4 deletions OverrideTest.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Target Name="Test" DependsOnTargets="TestAsTool"
Condition="'$(IsUnitTestProject)' == 'true' or '$(IsPerformanceTestProject)' == 'true'"/>

<Target Name="Test"
DependsOnTargets="TestAsTool"
Condition="'$(IsUnitTestProject)' == 'true' or '$(IsPerformanceTestProject)' == 'true'" />

</Project>
4 changes: 2 additions & 2 deletions src/Layout/pkg/windows/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
Expand All @@ -24,5 +24,5 @@
<!-- Technically we don't support .NET on any version of Windows where the version of Windows Installer is less than 5.0. -->
<DefineConstants Condition="'$(InstallerPlatform)' != 'arm64'">$(DefineConstants);InstallerVersion=200</DefineConstants>
<DefineConstants Condition="'$(InstallerPlatform)' == 'arm64'">$(DefineConstants);InstallerVersion=500</DefineConstants>
</PropertyGroup>

</Project>
3 changes: 2 additions & 1 deletion src/Layout/pkg/windows/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.wixproj'">
Expand Down Expand Up @@ -70,4 +70,5 @@
<Output TaskParameter="OutputFile" PropertyName="_WixBuildCommandPackageNameOutput" />
</CreateWixBuildWixpack>
</Target>

</Project>
3 changes: 1 addition & 2 deletions src/Layout/pkg/windows/bundles/sdk/bundle.thm
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
<!-- Use system colors where possible as they change based on themes and are automatically adjusted for high contrast.
For custom colors, ensure the contrast ratio is at least 4.5:1 (3:1 for large text and other UI components).
Expand All @@ -15,7 +14,7 @@
contrast themes like Dusk drops the ratio below 4.5. -->
<Font Id="ErrorFont" Height="-12" Weight="900" Foreground="windowtext" Background="window">Segoe UI</Font>

<!-- In v5, Window@Width and Window@Height refers to the client area, not the window area. wixstdba calls
<!-- In v5, Window@Width and Window@Height refers to the client area, not the window area. wixstdba calls
AdjustWindowRectEx or AdjustWindowRectExForDpi (if supported) to produce a window with the desired client area. -->
<Window Width="644" Height="460" HexStyle="100a0000" FontId="DefaultFont" Caption="#(loc.Caption)" IconFile="dotnet.ico">
<ImageControl Name="DotNetLogo" X="12" Y="-48" Width="124" Height="124" ImageFile="DotNetLogo_124x.png" Visible="yes" />
Expand Down
1 change: 0 additions & 1 deletion src/Layout/pkg/windows/bundles/sdk/bundle.wixproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project Sdk="Microsoft.WixToolset.Sdk">

<PropertyGroup>
Expand Down
11 changes: 5 additions & 6 deletions src/Layout/pkg/windows/bundles/sdk/bundle.wxs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<Bundle Name="$(ProductName)" Manufacturer="$(Manufacturer)" Version="$(BundleVersion)" UpgradeCode="$(UpgradeCode)" AboutUrl="https://aka.ms/netcorehelp/"
Compressed="yes">
Expand Down Expand Up @@ -135,7 +134,7 @@
<?endif?>

<!--
When installing the SDK bundle to a custom location using the commandline parameters, it is intended, not mandatory, that
When installing the SDK bundle to a custom location using the commandline parameters, it is intended, not mandatory, that
both "DOTNETHOME_X86" and "DOTNETHOME_X64" should be used on the commandline and should take this convention:
DOTNETHOME_X86=<InstallFolder>\x86
DOTNETHOME_X64=<InstallFolder>\x64
Expand All @@ -160,17 +159,17 @@

<!--
The finalizer is not an installation package. It's detected based on the bundle's installation state (WixBundleInstalled).

User action | Install | Repair | Modify | Uninstall | Uninstall (Upgrade)
WixBundleInstalled | FALSE | TRUE | TRUE | TRUE | TRUE
WixBundleInstalled | FALSE | TRUE | TRUE | TRUE | TRUE
WixBundleAction | 6 | 8 | 7 | 4 | 4
Finalizer (Plan) | None | Execute | Execute | Execute | Execute

Setting an InstallCondition will cause Burn to remove the package if it evaluates to FALSE and
the bundle is being installed, repaired, or modified. This breaks upgrades. We cannot use
WixBundleAction in the DetectCondition because it's not finalized until the planning phase completes (after
the detect phase). See https://github.com/orgs/wixtoolset/discussions/9017 for more detail.

The finalizer also takes the bundle action as a parameter to ensure it no-ops, but logs the action. -->
<ExePackage SourceFile="$(FinalizerExeSourceFile)"
Bundle="no"
Expand Down
3 changes: 2 additions & 1 deletion src/Layout/pkg/windows/msis/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
Expand All @@ -14,4 +14,5 @@
<!-- Turn off ICE validation. CodeIntegrity and AppLocker block ICE checks that require elevation, even when running as administator. -->
<SuppressValidation>true</SuppressValidation>
</PropertyGroup>

</Project>
1 change: 0 additions & 1 deletion src/Layout/pkg/windows/msis/directories.wxs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<!-- Directory structure for the .NET SDK installers. ProgramFiles6432Folder is a new construct introduced in v4. The directory reference automatically
Expand Down
5 changes: 3 additions & 2 deletions src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project Sdk="Microsoft.WixToolset.Sdk">
<Project Sdk="Microsoft.WixToolset.Sdk">

<ItemGroup>
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix5\product\dotnethome_x64.wxs" />
<Compile Include="..\provider.wxs" />
Expand All @@ -19,4 +19,5 @@
<DefineConstants>$(DefineConstants);DependencyKeyName=NetCore_SdkPlaceholder</DefineConstants>
</PropertyGroup>
</Target>

</Project>
1 change: 0 additions & 1 deletion src/Layout/pkg/windows/msis/placeholder/product.wxs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Package UpgradeCode="$(UpgradeCode)" Version="$(ProductVersion)" Manufacturer="$(Manufacturer)" InstallerVersion="$(InstallerVersion)" Compressed="yes"
Scope="perMachine" Language="$(ProductLanguage)" Name="$(ProductName)">
Expand Down
1 change: 0 additions & 1 deletion src/Layout/pkg/windows/msis/registrykeys.wxs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<ComponentGroup Id="AuthoredRegistryKeys_x86node">
Expand Down
1 change: 0 additions & 1 deletion src/Layout/pkg/windows/msis/templates/product.wxs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Package UpgradeCode="$(UpgradeCode)" Version="$(ProductVersion)" Manufacturer="$(Manufacturer)" InstallerVersion="$(InstallerVersion)" Compressed="yes"
Scope="perMachine" Language="$(ProductLanguage)" Name="$(ProductName)">
Expand Down
3 changes: 2 additions & 1 deletion src/Layout/pkg/windows/msis/templates/templates.wixproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project Sdk="Microsoft.WixToolset.Sdk">

<ItemGroup>
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix5\product\dotnethome_x64.wxs" />
<Compile Include="..\directories.wxs" />
Expand Down Expand Up @@ -31,4 +31,5 @@
<DefineConstants>$(DefineConstants);DependencyKeyName=$(DependencyKeyName)</DefineConstants>
</PropertyGroup>
</Target>

</Project>
1 change: 0 additions & 1 deletion src/Layout/pkg/windows/msis/toolset/product.wxs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
Expand Down
3 changes: 2 additions & 1 deletion src/Layout/pkg/windows/msis/toolset/toolset.wixproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project Sdk="Microsoft.WixToolset.Sdk">

<ItemGroup>
<Compile Include="$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix5\product\dotnethome_x64.wxs" />
<Compile Include="..\registrykeys.wxs" />
Expand Down Expand Up @@ -32,4 +32,5 @@
<DefineConstants>$(DefineConstants);DependencyKeyName=Dotnet_CLI</DefineConstants>
</PropertyGroup>
</Target>

</Project>
4 changes: 2 additions & 2 deletions src/Layout/redist/targets/GenerateMSIs.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<PropertyGroup>
<GenerateMsisDependsOn Condition="'$(GenerateSdkBundleOnly)' != 'true'">
GenerateSdkMsi;
Expand Down Expand Up @@ -146,7 +146,7 @@
OutputPath=$([System.IO.Path]::GetDirectoryName(%(MSIInstallerFile)));
OutputName=$([System.IO.Path]::GetFileNameWithoutExtension(%(MSIInstallerFile)));
DependencyKeyName=%(DependencyKeyName);TemplateLayoutDirectoryToHarvest=%(LayoutPath);
BrandName=%(BrandName);UpgradeCode=%(UpgradeCode);
BrandName=%(BrandName);UpgradeCode=%(UpgradeCode);
DotnetSrc=%(LayoutPath)"/>
<ItemGroup>
<ChainMsi Include="%(TemplatesMsi.MSIInstallerFile)" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<PropertyGroup>
<OutDirName>Tests\$(MSBuildProjectName)</OutDirName>
Expand All @@ -13,7 +11,7 @@
<TargetFramework>$(SdkTargetFramework)</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AwesomeAssertions.Json" />
<PackageReference Include="Microsoft.Build.Framework" />
Expand All @@ -35,5 +33,5 @@
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

</Project>
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<!-- This is a smaller build of Microsoft.NET.Build.Tasks to be used outside of SDK projects -->

<PropertyGroup>
<PackageId>Microsoft.NET.Build.Extensions</PackageId>
<OutDirName>$(Configuration)\Sdks\$(PackageId)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools</OutDirName>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
Expand All @@ -28,7 +26,7 @@
<!-- MSBuild Task DLLs need to be versioned with every build -->
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
</PropertyGroup>

<PropertyGroup>
<OutputPath>$(BaseOutputPath)</OutputPath>
<DefineConstants>$(DefineConstants);EXTENSIONS</DefineConstants>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<PropertyGroup>
<OutDirName>Tests\$(MSBuildProjectName)</OutDirName>
Expand Down
4 changes: 2 additions & 2 deletions test/Common/Empty.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<!-- This is an empty props file used to ensure that other Directory.Build.props higher on the path aren't imported -->

</Project>
4 changes: 2 additions & 2 deletions test/Common/Empty.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<!-- This is an empty targets file used to ensure that other Directory.Build.targets higher on the path aren't imported -->

</Project>
1 change: 0 additions & 1 deletion test/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<PropertyGroup>
<EnableDefaultItems>false</EnableDefaultItems>
<OutDirName>Tests\$(MSBuildProjectName)</OutDirName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<PropertyGroup>
<EnableDefaultItems>false</EnableDefaultItems>
<OutDirName>Tests\$(MSBuildProjectName)</OutDirName>
Expand All @@ -16,7 +15,7 @@
<PropertyGroup>
<PackageId>testSdkClean</PackageId>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<PropertyGroup>
<EnableDefaultItems>false</EnableDefaultItems>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<PropertyGroup>
<EnableDefaultItems>false</EnableDefaultItems>
Expand All @@ -17,7 +15,7 @@
<PropertyGroup>
<PackageId>testSdkRestore</PackageId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NuGet.Packaging" />
<PackageReference Include="NuGet.ProjectModel" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build">

<Target Name="GetStaticWebAssetsProjectConfiguration" Returns="@(_StaticWebAssetThisProjectConfiguration)">
<ItemGroup>
Expand All @@ -19,7 +18,7 @@
</_StaticWebAssetThisProjectConfiguration>
</ItemGroup>
</Target>

<Target Name="GetCurrentProjectBuildStaticWebAssetItems" Returns="@(_BuildAsset)">
<ItemGroup>
<CandidateBuildAssets Include="wwwroot\**" />
Expand Down Expand Up @@ -66,4 +65,5 @@
</_PublishAsset>
</ItemGroup>
</Target>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<PropertyGroup>
<EnableDefaultItems>false</EnableDefaultItems>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build">

<Target Name="GetStaticWebAssetsProjectConfiguration" Returns="@(_StaticWebAssetThisProjectConfiguration)">
<ItemGroup>
Expand Down Expand Up @@ -66,4 +65,5 @@
</_PublishAsset>
</ItemGroup>
</Target>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<Project>

<PropertyGroup>
<EnableDefaultItems>false</EnableDefaultItems>
Expand Down
1 change: 0 additions & 1 deletion test/Microsoft.NET.TestFramework/SetupTestRoot.targets
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<ItemGroup>
Expand Down
Loading
Loading