Skip to content

Update policheck version #3225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahabhijeet merged 1 commit into from
May 17, 2017
Merged

Update policheck version #3225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ binaries/
[Rr]elease/
build/
restoredPackages/
PolicheckOutput/
tools/net46/
tools/Microsoft.WindowsAzure.Build.Tasks/packages/
PublishedNugets/
Expand Down
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<AuthenticationSolution>src\Authentication\Authentication.sln</AuthenticationSolution>
<ManagementLibrariesSolution>AzureManagementLibraries.sln</ManagementLibrariesSolution>
<BinariesFolder>$(LibraryRoot)binaries</BinariesFolder>
<PoliCheckOutputDir>$(LibraryRoot)PolicheckOutput</PoliCheckOutputDir>
<BuiltPackageOutputDir>$(BinariesFolder)\packages</BuiltPackageOutputDir>
<DelaySign Condition =" '$(DelaySign)' == '' ">false</DelaySign>
<CodeSign Condition=" '$(CodeSign)' == '' ">false</CodeSign>
Expand Down
13 changes: 13 additions & 0 deletions tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks.Tests/CategorizeProjectTaskTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@ public void ScopedProject()
}
}

[Fact]
public void UnSupportedProjects()
{
SDKCategorizeProjects cproj = new SDKCategorizeProjects();
cproj.SourceRootDirPath = sourceRootDir;
cproj.BuildScope = @"SDKs\Batch\DataPlane";

if (cproj.Execute())
{
Assert.Equal(3, cproj.unSupportedProjectsToBuild.Count<ITaskItem>());
}
}

[Fact]
public void IgnoredProjects()
{
Expand Down
12 changes: 6 additions & 6 deletions tools/Microsoft.WindowsAzure.Build.Tasks/Build.Tasks/SDKCategorizeProjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ public override bool Execute()

Debug.WriteLine("Parsing Projects took {0}", (projTimeAfter - projTimeBefore).TotalSeconds.ToString());

var net452SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
var netStd14SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netstandard14 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
var netCore11SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
var testNetCore11Projects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem;
var testNet452Projects = from s in projWithMetaData where (s.IsTargetFxSupported = true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem;
var unSupportedProjects = from s in projWithMetaData where (s.IsTargetFxSupported = false) select s.ProjectTaskItem;
var net452SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
var netStd14SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.netstandard14 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
var netCore11SdkProjects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Sdk) select s.ProjectTaskItem;
var testNetCore11Projects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.netcoreapp11 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem;
var testNet452Projects = from s in projWithMetaData where (s.IsTargetFxSupported == true && s.FxMoniker == TargetFrameworkMoniker.net452 && s.ProjectType == SdkProjctType.Test) select s.ProjectTaskItem;
var unSupportedProjects = from s in projWithMetaData where (s.IsTargetFxSupported == false) select s.ProjectTaskItem;

net452SdkProjectsToBuild = net452SdkProjects?.ToArray<ITaskItem>();
netStd14SdkProjectsToBuild = netStd14SdkProjects?.ToArray<ITaskItem>();
Expand Down
2 changes: 2 additions & 0 deletions tools/buildTargets/common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@
<Message Text=" "/>
<Message Text="TestSDKProjects ....... @(FilteredTestProjects->Count())"/>
<Message Text="%(FilteredTestProjects.Identity)"/>
<Message Text="UnSupported Projects ....... @(unSupportedProjectsToBuild->Count())"/>
<Message Text="%(unSupportedProjectsToBuild.Identity)"/>

<ItemGroup>
<net452SDKProjects Include="@(net452SDKProj)"/>
Expand Down
14 changes: 8 additions & 6 deletions tools/buildTargets/signing.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<StrongNameToken Condition=" '$(StrongNameToken)' == '' ">31bf3856ad364e35</StrongNameToken>
<CorporateScanPaths>@(ProjectToScanDirs)</CorporateScanPaths>
<ScopeScanPath Condition=" '$(Scope)' != ''">$(LibrarySourceFolder)\$(Scope.TrimEnd('\'))</ScopeScanPath>
<CorporateScanPaths Condition=" Exists($(ScopeScanPath))">$(ScopeScanPath)</CorporateScanPaths>
<CorporateScanPaths Condition=" '$(CorporateScanPaths)' == '' ">$(LibrarySourceFolder)</CorporateScanPaths>
</PropertyGroup>
<!--Condition=" '$(CodeSign)' == 'true' "-->
<Target Name="PreSign" >
<GetFrameworkSdkPath>
<Output TaskParameter="Path" PropertyName="WindowsSdkPath"/>
Expand All @@ -17,8 +18,10 @@
<Message Importance="high" Text="Contains no files. Code sign will skip."
Condition="'@(DelaySignedAssembliesToValidate)' == ''" />

<!--<CallTarget Targets="CorporateValidation" Condition=" '$(OnPremiseBuild)'=='true' " />-->

<Message Text="Running PoliCheck on ..... $(CorporateScanPaths)" Condition=" '$(CorporateScanPaths)' != '' and '$(RunGlobalReadinessTools)' == 'true'"/>
<CallTarget Targets="CorporateValidation" Condition=" '$(OnPremiseBuild)' == 'true' and '$(RunGlobalReadinessTools)' == 'true' "/>
<!--Condition=" '$(OnPremiseBuild)'=='true' and '$(RunGlobalReadinessTools)' == 'true' "-->

<ValidateStrongNameSignatureTask
WindowsSdkPath="$(WindowsSdkPath)"
Assembly="%(DelaySignedAssembliesToValidate.Identity)"
Expand Down Expand Up @@ -98,5 +101,4 @@
<Exec Command='$(WindowsSDK_ExecutablePath_x86)\sn.exe -Vx *' Condition="$(isadmin) != 0"/>
<Exec Command='$(WindowsSDK_ExecutablePath_x64)\sn.exe -Vx *' Condition="$(isadmin) != 0"/>
</Target>
</Project>

</Project>