Skip to content

Commit c91204f

Browse files
Nirmal4GNirmal4G
committed
Use Common paths for Build, Publish and Pack
The new Output paths point to... Build: `~build\...` Restore: `~build\ext` Publish: `~publish\...` Pack: `~publish\{bin,obj}`
1 parent e034932 commit c91204f

19 files changed

+50
-104
lines changed

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
# User-specific files (MonoDevelop/Xamarin Studio)
1212
*.userprefs
1313

14+
# Working folders
15+
~build/
16+
~publish/
17+
~packages/
18+
1419
# Build results
1520
[Dd]ebug/
1621
[Dd]ebugPublic/

‎Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<When Condition="$(IsCoreProject)">
1212
<PropertyGroup>
1313
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14-
<PackageOutputPath>$(RepositoryDirectory)bin\nupkg</PackageOutputPath>
1514
<GenerateLibraryLayout Condition="$(IsUwpProject)">true</GenerateLibraryLayout>
1615
<TreatWarningsAsErrors Condition="'$(Configuration)' == 'Release'">true</TreatWarningsAsErrors>
1716
</PropertyGroup>

‎GazeInputTest/GazeInputTest.csproj

-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
</PropertyGroup>
2222
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2323
<DebugSymbols>true</DebugSymbols>
24-
<OutputPath>bin\x86\Debug\</OutputPath>
2524
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
2625
<DebugType>full</DebugType>
2726
<PlatformTarget>x86</PlatformTarget>
@@ -30,7 +29,6 @@
3029
<Prefer32Bit>true</Prefer32Bit>
3130
</PropertyGroup>
3231
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
33-
<OutputPath>bin\x86\Release\</OutputPath>
3432
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
3533
<Optimize>true</Optimize>
3634
<DebugType>pdbonly</DebugType>
@@ -42,7 +40,6 @@
4240
</PropertyGroup>
4341
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
4442
<DebugSymbols>true</DebugSymbols>
45-
<OutputPath>bin\ARM\Debug\</OutputPath>
4643
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
4744
<DebugType>full</DebugType>
4845
<PlatformTarget>ARM</PlatformTarget>
@@ -51,7 +48,6 @@
5148
<Prefer32Bit>true</Prefer32Bit>
5249
</PropertyGroup>
5350
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
54-
<OutputPath>bin\ARM\Release\</OutputPath>
5551
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
5652
<Optimize>true</Optimize>
5753
<DebugType>pdbonly</DebugType>
@@ -63,7 +59,6 @@
6359
</PropertyGroup>
6460
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
6561
<DebugSymbols>true</DebugSymbols>
66-
<OutputPath>bin\ARM64\Debug\</OutputPath>
6762
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
6863
<DebugType>full</DebugType>
6964
<PlatformTarget>ARM64</PlatformTarget>
@@ -72,7 +67,6 @@
7267
<Prefer32Bit>true</Prefer32Bit>
7368
</PropertyGroup>
7469
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
75-
<OutputPath>bin\ARM64\Release\</OutputPath>
7670
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
7771
<Optimize>true</Optimize>
7872
<DebugType>pdbonly</DebugType>
@@ -84,7 +78,6 @@
8478
</PropertyGroup>
8579
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
8680
<DebugSymbols>true</DebugSymbols>
87-
<OutputPath>bin\x64\Debug\</OutputPath>
8881
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
8982
<DebugType>full</DebugType>
9083
<PlatformTarget>x64</PlatformTarget>
@@ -93,7 +86,6 @@
9386
<Prefer32Bit>true</Prefer32Bit>
9487
</PropertyGroup>
9588
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
96-
<OutputPath>bin\x64\Release\</OutputPath>
9789
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
9890
<Optimize>true</Optimize>
9991
<DebugType>pdbonly</DebugType>

‎Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
</PropertyGroup>
2525
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2626
<DebugSymbols>true</DebugSymbols>
27-
<OutputPath>bin\x86\Debug\</OutputPath>
2827
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
2928
<DebugType>full</DebugType>
3029
<PlatformTarget>x86</PlatformTarget>
@@ -34,7 +33,6 @@
3433
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
3534
</PropertyGroup>
3635
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
37-
<OutputPath>bin\x86\Release\</OutputPath>
3836
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS</DefineConstants>
3937
<Optimize>true</Optimize>
4038
<DebugType>pdbonly</DebugType>
@@ -49,7 +47,6 @@
4947
</PropertyGroup>
5048
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
5149
<DebugSymbols>true</DebugSymbols>
52-
<OutputPath>bin\ARM\Debug\</OutputPath>
5350
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
5451
<DebugType>full</DebugType>
5552
<PlatformTarget>ARM</PlatformTarget>
@@ -58,7 +55,6 @@
5855
<Prefer32Bit>true</Prefer32Bit>
5956
</PropertyGroup>
6057
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
61-
<OutputPath>bin\ARM\Release\</OutputPath>
6258
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS</DefineConstants>
6359
<Optimize>true</Optimize>
6460
<DebugType>pdbonly</DebugType>
@@ -73,7 +69,6 @@
7369
</PropertyGroup>
7470
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
7571
<DebugSymbols>true</DebugSymbols>
76-
<OutputPath>bin\x64\Debug\</OutputPath>
7772
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
7873
<DebugType>full</DebugType>
7974
<PlatformTarget>x64</PlatformTarget>
@@ -82,7 +77,6 @@
8277
<Prefer32Bit>true</Prefer32Bit>
8378
</PropertyGroup>
8479
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
85-
<OutputPath>bin\x64\Release\</OutputPath>
8680
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS</DefineConstants>
8781
<Optimize>true</Optimize>
8882
<DebugType>pdbonly</DebugType>
@@ -1505,7 +1499,6 @@
15051499
</PropertyGroup>
15061500
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
15071501
<DebugSymbols>true</DebugSymbols>
1508-
<OutputPath>bin\ARM64\Debug\</OutputPath>
15091502
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
15101503
<NoStdLib>true</NoStdLib>
15111504
<DebugType>full</DebugType>
@@ -1515,7 +1508,6 @@
15151508
<Prefer32Bit>true</Prefer32Bit>
15161509
</PropertyGroup>
15171510
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
1518-
<OutputPath>bin\ARM64\Release\</OutputPath>
15191511
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS</DefineConstants>
15201512
<Optimize>true</Optimize>
15211513
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎Microsoft.Toolkit.Uwp.Samples.BackgroundTasks/Microsoft.Toolkit.Uwp.Samples.BackgroundTasks.csproj

-10
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<DebugSymbols>true</DebugSymbols>
2424
<DebugType>full</DebugType>
2525
<Optimize>false</Optimize>
26-
<OutputPath>bin\Debug\</OutputPath>
2726
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
2827
<ErrorReport>prompt</ErrorReport>
2928
<WarningLevel>4</WarningLevel>
@@ -32,15 +31,13 @@
3231
<PlatformTarget>AnyCPU</PlatformTarget>
3332
<DebugType>pdbonly</DebugType>
3433
<Optimize>true</Optimize>
35-
<OutputPath>bin\Release\</OutputPath>
3634
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
3735
<ErrorReport>prompt</ErrorReport>
3836
<WarningLevel>4</WarningLevel>
3937
</PropertyGroup>
4038
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
4139
<PlatformTarget>x86</PlatformTarget>
4240
<DebugSymbols>true</DebugSymbols>
43-
<OutputPath>bin\x86\Debug\</OutputPath>
4441
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
4542
<DebugType>full</DebugType>
4643
<PlatformTarget>x86</PlatformTarget>
@@ -49,7 +46,6 @@
4946
</PropertyGroup>
5047
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
5148
<PlatformTarget>x86</PlatformTarget>
52-
<OutputPath>bin\x86\Release\</OutputPath>
5349
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
5450
<Optimize>true</Optimize>
5551
<DebugType>pdbonly</DebugType>
@@ -60,7 +56,6 @@
6056
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
6157
<PlatformTarget>ARM</PlatformTarget>
6258
<DebugSymbols>true</DebugSymbols>
63-
<OutputPath>bin\ARM\Debug\</OutputPath>
6459
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
6560
<DebugType>full</DebugType>
6661
<PlatformTarget>ARM</PlatformTarget>
@@ -69,7 +64,6 @@
6964
</PropertyGroup>
7065
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
7166
<PlatformTarget>ARM</PlatformTarget>
72-
<OutputPath>bin\ARM\Release\</OutputPath>
7367
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
7468
<Optimize>true</Optimize>
7569
<DebugType>pdbonly</DebugType>
@@ -80,7 +74,6 @@
8074
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
8175
<PlatformTarget>x64</PlatformTarget>
8276
<DebugSymbols>true</DebugSymbols>
83-
<OutputPath>bin\x64\Debug\</OutputPath>
8477
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
8578
<DebugType>full</DebugType>
8679
<PlatformTarget>x64</PlatformTarget>
@@ -89,7 +82,6 @@
8982
</PropertyGroup>
9083
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
9184
<PlatformTarget>x64</PlatformTarget>
92-
<OutputPath>bin\x64\Release\</OutputPath>
9385
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
9486
<Optimize>true</Optimize>
9587
<DebugType>pdbonly</DebugType>
@@ -120,15 +112,13 @@
120112
</PropertyGroup>
121113
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
122114
<DebugSymbols>true</DebugSymbols>
123-
<OutputPath>bin\ARM64\Debug\</OutputPath>
124115
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
125116
<DebugType>full</DebugType>
126117
<PlatformTarget>ARM64</PlatformTarget>
127118
<UseVSHostingProcess>false</UseVSHostingProcess>
128119
<ErrorReport>prompt</ErrorReport>
129120
</PropertyGroup>
130121
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
131-
<OutputPath>bin\ARM64\Release\</OutputPath>
132122
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
133123
<Optimize>true</Optimize>
134124
<DebugType>pdbonly</DebugType>

‎SmokeTests/SmokeTest.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(CurrentProject)' != ''">
3939
<AppxPackageName>SmokeTest_$(CurrentProject)</AppxPackageName>
40-
<IntermediateOutputPath>obj\$(CurrentProject)\</IntermediateOutputPath>
41-
<OutputPath>bin\$(CurrentProject)\$(Platform)\$(Configuration)\</OutputPath>
40+
<BuildDir Condition="'$(BuildDir)' == ''">~build\</BuildDir>
41+
<BaseIntermediateOutputPath>$(BuildDir)$(CurrentProject)\obj\</BaseIntermediateOutputPath>
42+
<BaseOutputPath>$(BuildDir)$(CurrentProject)\bin\</BaseOutputPath>
4243
</PropertyGroup>
4344
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
4445
<DebugSymbols>true</DebugSymbols>
@@ -123,7 +124,7 @@
123124
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
124125
<Target Name="BeforeBuild">
125126
<ItemGroup Condition="$(CurrentProject) != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI'">
126-
<NuGetPackage Include="$(RepositoryDirectory)bin\nupkg\$(CurrentProject).*.nupkg" />
127+
<NuGetPackage Include="$(RepositoryDirectory)~packages\bin\$(CurrentProject).*.nupkg" />
127128
<NuGetPackageFiltered Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Identity)', `$(CurrentProject).([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?.nupkg`))" Include="@(NuGetPackage)" />
128129
</ItemGroup>
129130
<Error Condition="'@(NuGetPackageFiltered)' == '' and $(CurrentProject) != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI'" Text="NuGet '$(CurrentProject).[SEMVER].nupkg' doesn't exist!" />

‎SmokeTests/SmokeTests.proj

+2-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<Message Importance="High" Text="Building project %(ProjectsToBuild.Identity): (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))" />
4545

4646
<MSBuild Projects="SmokeTest.csproj"
47-
Targets="restore;build"
47+
Targets="Restore;Build"
4848
Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)" />
4949
</Target>
5050

@@ -56,7 +56,6 @@
5656

5757
<ToolkitProject Include="@(ToolkitPackage)">
5858
<Platforms>x86;x64;ARM;ARM64</Platforms>
59-
<BinDir>bin</BinDir>
6059
<AssemblyName>%(ToolkitPackage.Identity)</AssemblyName>
6160
</ToolkitProject>
6261

@@ -78,7 +77,7 @@
7877

7978
<Target Name="CheckNuGetPackages">
8079
<PropertyGroup>
81-
<NuGetOutputPath>$(MSBuildThisFileDirectory)..\bin\nupkg</NuGetOutputPath>
80+
<NuGetOutputPath>$(MSBuildThisFileDirectory)..\~packages\bin</NuGetOutputPath>
8281
</PropertyGroup>
8382
<ItemGroup>
8483
<NuGetPackage Include="$(NuGetOutputPath)\*.nupkg" />

‎SmokeTests/nuget.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<configuration>
22
<packageSources>
33
<clear />
4-
<add key="Local" value="..\bin\nupkg" />
4+
<add key="Local" value="..\~packages\bin" />
55
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
66
</packageSources>
77
</configuration>

‎UITests/UITests.App/UITests.App.csproj

-8
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</PropertyGroup>
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
3333
<DebugSymbols>true</DebugSymbols>
34-
<OutputPath>bin\x86\Debug\</OutputPath>
3534
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
3635
<DebugType>full</DebugType>
3736
<PlatformTarget>x86</PlatformTarget>
@@ -40,7 +39,6 @@
4039
<Prefer32Bit>true</Prefer32Bit>
4140
</PropertyGroup>
4241
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
43-
<OutputPath>bin\x86\Release\</OutputPath>
4442
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
4543
<Optimize>true</Optimize>
4644
<DebugType>pdbonly</DebugType>
@@ -52,7 +50,6 @@
5250
</PropertyGroup>
5351
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
5452
<DebugSymbols>true</DebugSymbols>
55-
<OutputPath>bin\ARM\Debug\</OutputPath>
5653
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
5754
<DebugType>full</DebugType>
5855
<PlatformTarget>ARM</PlatformTarget>
@@ -61,7 +58,6 @@
6158
<Prefer32Bit>true</Prefer32Bit>
6259
</PropertyGroup>
6360
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
64-
<OutputPath>bin\ARM\Release\</OutputPath>
6561
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
6662
<Optimize>true</Optimize>
6763
<DebugType>pdbonly</DebugType>
@@ -73,7 +69,6 @@
7369
</PropertyGroup>
7470
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
7571
<DebugSymbols>true</DebugSymbols>
76-
<OutputPath>bin\ARM64\Debug\</OutputPath>
7772
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
7873
<DebugType>full</DebugType>
7974
<PlatformTarget>ARM64</PlatformTarget>
@@ -83,7 +78,6 @@
8378
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
8479
</PropertyGroup>
8580
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
86-
<OutputPath>bin\ARM64\Release\</OutputPath>
8781
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
8882
<Optimize>true</Optimize>
8983
<DebugType>pdbonly</DebugType>
@@ -95,7 +89,6 @@
9589
</PropertyGroup>
9690
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
9791
<DebugSymbols>true</DebugSymbols>
98-
<OutputPath>bin\x64\Debug\</OutputPath>
9992
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
10093
<DebugType>full</DebugType>
10194
<PlatformTarget>x64</PlatformTarget>
@@ -104,7 +97,6 @@
10497
<Prefer32Bit>true</Prefer32Bit>
10598
</PropertyGroup>
10699
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
107-
<OutputPath>bin\x64\Release\</OutputPath>
108100
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
109101
<Optimize>true</Optimize>
110102
<DebugType>pdbonly</DebugType>

0 commit comments

Comments
 (0)