Skip to content

Commit de87261

Browse files
author
Omar Tawfik
committed
Clean up initial targets
1 parent f32857c commit de87261

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

‎setup/FSharp.SDK/FSharp.SDK.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Project InitialTargets="CheckPropertiesArePassed" ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
55
<FSharpTreeRoot>$(MSBuildProjectDirectory)\..\..</FSharpTreeRoot>
66
<SetupRootFolder>$(FSharpTreeRoot)\setup</SetupRootFolder>
@@ -64,7 +64,7 @@
6464
<Import Project="$(WixInstallPath)\wix.targets" />
6565
<Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />
6666

67-
<Target Name="CheckLocaleIsPassed" BeforeTargets="Compile">
67+
<Target Name="CheckPropertiesArePassed">
6868
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
6969
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
7070
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />

‎setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3+
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<PropertyGroup>
45
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
56
<OutputArchitecture>neutral</OutputArchitecture>
@@ -27,7 +28,7 @@
2728
<Package Include="Dependencies.swr" />
2829
</ItemGroup>
2930

30-
<Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
31+
<Target Name="CheckPropertiesArePassed">
3132
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
3233
</Target>
3334

‎setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3+
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<PropertyGroup>
45
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
56
<OutputArchitecture>neutral</OutputArchitecture>
@@ -24,7 +25,7 @@
2425
<Package Include="Files.swr" />
2526
</ItemGroup>
2627

27-
<Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
28+
<Target Name="CheckPropertiesArePassed">
2829
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
2930
</Target>
3031

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3+
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<PropertyGroup>
45
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
56
<OutputArchitecture>neutral</OutputArchitecture>
@@ -38,7 +39,7 @@
3839
<!-- MSI is already signed before wrapping it here -->
3940
</Target>
4041

41-
<Target Name="CheckLocaleIsPassed" BeforeTargets="Compile">
42+
<Target Name="CheckPropertiesArePassed">
4243
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
4344
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
4445
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />

‎setup/Swix/Microsoft.FSharp.Vsix.Core/Microsoft.FSharp.Vsix.Core.swixproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3+
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<PropertyGroup>
45
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
56
<OutputArchitecture>neutral</OutputArchitecture>
@@ -29,7 +30,7 @@
2930
<!-- SWIX plugin adds the built vsix to signing automatically -->
3031
</Target>
3132

32-
<Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
33+
<Target Name="CheckPropertiesArePassed">
3334
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
3435
<Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
3536
</Target>

‎setup/Swix/Microsoft.FSharp.Vsix.Resources/Microsoft.FSharp.Vsix.Resources.swixproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3+
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<PropertyGroup>
45
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
56
<OutputArchitecture>neutral</OutputArchitecture>
@@ -39,7 +40,7 @@
3940
<!-- SWIX plugin adds the built vsix to signing automatically -->
4041
</Target>
4142

42-
<Target Name="CheckPropertiesArePassed" BeforeTargets="Build">
43+
<Target Name="CheckPropertiesArePassed">
4344
<Error Condition="'$(VSSku)' == ''" Text="A 'VSSku' property must be passed to the project." />
4445
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
4546
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />

0 commit comments

Comments
 (0)