diff options
| author | thsparks <thsparks@microsoft.com> | 2022-03-05 02:41:32 +0300 |
|---|---|---|
| committer | thsparks <thsparks@microsoft.com> | 2022-03-05 02:41:32 +0300 |
| commit | 84aa093427daec3be603a4431766ec42d3d8eebe (patch) | |
| tree | 528d5f01c3c39f3144d1307da1e99f6ee3968025 | |
| parent | f2838cff2163b3cea750853b545df75975e591ea (diff) | |
Leverage Directory.Build.props and remove unnecessary configuration checks (signing pipeline only builds one configuration).
| -rw-r--r-- | Directory.Build.props | 12 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj | 10 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj | 11 |
3 files changed, 12 insertions, 21 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index dfcb57f..4ec85ea 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,3 +1,13 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <!-- Deliberately empty so we don't inherit files from whoever submodules this repository --> + <!-- Enable MicroBuild signing on all projects, if the build is running in a pipeline where MicroBuild has been setup. --> + <ItemGroup> + <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core"> + <Version>1.0.0</Version> + </PackageReference> + </ItemGroup> + <ItemGroup> + <FilesToSign Include="$(OutDir)\$(AssemblyName).dll"> + <Authenticode>Microsoft400</Authenticode> + </FilesToSign> + </ItemGroup> </Project> diff --git a/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj b/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj index 0fe92d6..42f3aba 100644 --- a/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj +++ b/Xamarin.PropertyEditing.Windows/Xamarin.PropertyEditing.Windows.csproj @@ -31,11 +31,6 @@ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core">
- <Version>1.0.0</Version>
- </PackageReference>
- </ItemGroup>
- <ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="PresentationFramework.Aero" />
@@ -228,10 +223,5 @@ <Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
- <ItemGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'ReleaseWindows'">
- <FilesToSign Include="$(OutDir)\$(AssemblyName).dll">
- <Authenticode>Microsoft400</Authenticode>
- </FilesToSign>
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file diff --git a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj index 5a1ef6b..7ed4851 100644 --- a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj +++ b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj @@ -5,12 +5,6 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core"> - <Version>1.0.0</Version> - </PackageReference> - </ItemGroup> - - <ItemGroup> <EmbeddedResource Update="Properties\Resources.resx"> <Generator>PublicResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> @@ -27,14 +21,11 @@ </Compile> </ItemGroup> - <Target Name="GetFilesToSign" BeforeTargets="SignFiles" Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'ReleaseWindows'"> + <Target Name="GetFilesToSign" BeforeTargets="SignFiles"> <ItemGroup> <FilesToSign Include="$(OutDir)\**\$(AssemblyName).resources.dll"> <Authenticode>Microsoft400</Authenticode> </FilesToSign> - <FilesToSign Include="$(OutDir)\$(AssemblyName).dll"> - <Authenticode>Microsoft400</Authenticode> - </FilesToSign> </ItemGroup> </Target> </Project> |