Skip to content
Permalink
Browse files

Update scripts

  • Loading branch information...
GeertvanHorrik committed Jan 18, 2019
1 parent 18afbba commit 2b65b67f2a8dec21a1f23893bf0d713a3cdc6fe5
@@ -207,8 +207,18 @@ private void DeployUwpApps()
LogSeparator("Deploying UWP app '{0}'", uwpApp);
// TODO: How to Deploy?
Warning("Deploying of UWP apps is not yet implemented, please deploy '{0}' manually", uwpApp);
var artifactsDirectory = GetArtifactsDirectory(OutputRootDirectory);
var appxUploadFileName = GetAppxUploadFileName(artifactsDirectory, uwpApp, VersionMajorMinorPatch);
Information("Creating Windows Store app submission");
CreateWindowsStoreAppSubmission(appxUploadFileName, new WindowsStoreAppSubmissionSettings
{
ApplicationId = WindowsStoreAppId,
ClientId = WindowsStoreClientId,
ClientSecret = WindowsStoreClientSecret,
TenantId = WindowsStoreTenantId
});
}
}
@@ -71,6 +71,7 @@ var RepositoryBranchName = GetBuildServerVariable("RepositoryBranchName");
var RepositoryCommitId = GetBuildServerVariable("RepositoryCommitId");

// SonarQube
var SonarDisabled = bool.Parse(GetBuildServerVariable("SonarDisabled", "False"));
var SonarUrl = GetBuildServerVariable("SonarUrl");
var SonarUsername = GetBuildServerVariable("SonarUsername");
var SonarPassword = GetBuildServerVariable("SonarPassword");
@@ -115,7 +115,7 @@ Task("Build")
.IsDependentOn("CleanupCode")
.Does(async () =>
{
var enableSonar = !string.IsNullOrWhiteSpace(SonarUrl);
var enableSonar = !SonarDisabled && !string.IsNullOrWhiteSpace(SonarUrl);
if (enableSonar)
{
SonarBegin(new SonarBeginSettings
@@ -138,7 +138,7 @@ Task("Build")
}
else
{
Information("Skipping Sonar integration since url is not specified");
Information("Skipping Sonar integration since url is not specified or it has been explicitly disabled");
}
BuildComponents();
@@ -147,7 +147,7 @@ Task("Build")
BuildWpfApps();
BuildDockerImages();
if (!string.IsNullOrWhiteSpace(SonarUrl))
if (enableSonar)
{
SonarEnd(new SonarEndSettings
{
@@ -15,8 +15,20 @@
<PackageOutputPath>$(ProjectDir)..\..\output\$(Configuration)\</PackageOutputPath>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xml</AllowedOutputExtensionsInPackageBuildOutputFolder>
<Deterministic>False</Deterministic>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>

<!-- Workaround for binding redirects in non exe assemblies, see https://github.com/Microsoft/msbuild/issues/1310#issuecomment-309596435 -->
<Target Name="ForceGenerationOfBindingRedirects"
AfterTargets="ResolveAssemblyReferences"
BeforeTargets="GenerateBindingRedirects"
Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
<PropertyGroup>
<!-- Needs to be set in a target because it has to be set after the initial evaluation in the common targets -->
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
</Target>

<!-- CSharp language -->
<PropertyGroup>
<LangVersion>7.1</LangVersion>
BIN +249 KB (100%) tools/nuget.exe
Binary file not shown.

0 comments on commit 2b65b67

Please sign in to comment.
You can’t perform that action at this time.