From b4a558fb6d379f001189435f3f8cd37f0953d217 Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi <alzollin@microsoft.com> Date: Wed, 27 May 2020 20:33:44 -0700 Subject: [PATCH 1/2] Enabled deterministic builds. --- Directory.Build.props | 6 +++++- .../Microsoft.Toolkit.Services.csproj | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 71c69d86fc9..fc5c355de83 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -24,6 +24,10 @@ <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile> </PropertyGroup> + <PropertyGroup Condition="'$(TF_BUILD)' == 'true'"> + <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> + </PropertyGroup> + <Choose> <When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'"> <PropertyGroup> @@ -41,7 +45,7 @@ </Choose> <Choose> - <When Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'"> + <When Condition="'$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'"> <PropertyGroup> <!-- Optional: Declare that the Repository URL can be published to NuSpec --> <PublishRepositoryUrl>true</PublishRepositoryUrl> diff --git a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj index 5472a065af9..f7320a8a7e6 100644 --- a/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj +++ b/Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj @@ -14,6 +14,7 @@ <!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 --> <DebugType>Full</DebugType> <NoWarn>CS8002;CS0618</NoWarn> + <DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths> </PropertyGroup> <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'"> From 12874726f728b0eda433313313f839319235609f Mon Sep 17 00:00:00 2001 From: Alexandre Zollinger Chohfi <alzollin@microsoft.com> Date: Thu, 28 May 2020 01:24:27 -0700 Subject: [PATCH 2/2] Added design pdbs. --- Directory.Build.props | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index fc5c355de83..e00c9f90bd5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -45,7 +45,7 @@ </Choose> <Choose> - <When Condition="'$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'"> + <When Condition="'$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true'"> <PropertyGroup> <!-- Optional: Declare that the Repository URL can be published to NuSpec --> <PublishRepositoryUrl>true</PublishRepositoryUrl> diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj index 1ccc698f397..c4648ffd2a8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj @@ -14,7 +14,7 @@ <ItemGroup> <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" /> - <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll" Pack="true" PackagePath="lib\$(TargetFramework)\Design" /> + <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll;$(OutDir)\Design\$(MSBuildProjectName).Design.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" /> </ItemGroup> <ItemGroup> diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj index 1bb5b7c7c51..0785dd2fd3d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj @@ -55,7 +55,7 @@ <ItemGroup> <None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" /> - <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll" Pack="true" PackagePath="lib\$(TargetFramework)\Design" /> + <None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll;$(OutDir)\Design\$(MSBuildProjectName).Design.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" /> </ItemGroup> <ItemGroup>