Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion RemoteApplicationPublisher.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Global
{E23CF4FE-4FA6-4554-8A06-D741D336DB0A}.Release|x64.Build.0 = Release|x64
{5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Debug|x64.ActiveCfg = Debug|x64
{5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Release|x64.ActiveCfg = Release|x64
{5EEA7966-CB7D-4FE5-8B6E-7B416A4C4EB0}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
21 changes: 21 additions & 0 deletions RemoteApplicationPublisher/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

using System.Reflection;
using System.Resources;

// General Information
[assembly: AssemblyTitle("Remote Application Publisher")]
[assembly: AssemblyDescription("Remote Application Publisher")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("One Identity LLC")]
[assembly: AssemblyProduct("RemoteApplicationPublisher")]
[assembly: AssemblyCopyright("Copyright 2022 One Identity LLC")]
[assembly: AssemblyTrademark("One Identity LLC (TM)")]
[assembly: AssemblyCulture("")]

// Version information -- replaced at build time
[assembly: AssemblyVersion("1.1.0.32432")]
[assembly: AssemblyFileVersion("1.1.0.32432")]
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]



Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>disable</ImplicitUsings>
<ApplicationManifest>app.manifest</ApplicationManifest>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<StartupObject>RemoteApplicationPublisher.Program</StartupObject>
<PlatformTarget>x64</PlatformTarget>
<Platforms>x64</Platforms>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,10 @@
<Exec Command="dotnet publish $(ProjectDir)\..\RemoteApplicationPublisher\RemoteApplicationPublisher.csproj -c $(Configuration) -o $(ProjectDir)bin\$(Configuration)\Publish --self-contained true -r win-x64" />
<HeatDirectory SuppressAllWarnings="true" ToolPath="$(WixToolPath)" AutogenerateGuids="$(HarvestDirectoryAutogenerateGuids)" OutputFile="Component-generated.wxs" SuppressFragments="true" SuppressUniqueIds="true" Transforms="%(HarvestDirectory.Transforms)" Directory="$(ProjectDir)bin\$(Configuration)\Publish" ComponentGroupName="RemoteAppsPub_CommonAssemblies" DirectoryRefId="INSTALLLOCATION" KeepEmptyDirectories="false" PreprocessorVariable="var.SourceDir" SuppressRootDirectory="true" SuppressRegistry="true">
</HeatDirectory>
<!-- <GetAssemblyIdentity AssemblyFiles="$(ProjectDir)bin\$(Configuration)\Publish\RemoteApplicationPublisher.exe"> -->
<!-- <Output TaskParameter="Assemblies" ItemName="AsmInfo" /> -->
<!-- </GetAssemblyIdentity> -->
<!-- <CreateProperty Value="RemoteApplicationPublisher_%(AsmInfo.Version)_$(Configuration)"> -->
<CreateProperty Value="RemoteApplicationPublisher_1.0.0.0_$(Configuration)">
<GetAssemblyIdentity AssemblyFiles="$(ProjectDir)bin\$(Configuration)\Publish\RemoteApplicationPublisher.dll">
<Output TaskParameter="Assemblies" ItemName="AsmInfo" />
</GetAssemblyIdentity>
<CreateProperty Value="RemoteApplicationPublisher_%(AsmInfo.Version)_$(Configuration)">
<Output TaskParameter="Value" PropertyName="TargetName" />
</CreateProperty>
</Target>
Expand Down
8 changes: 8 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ pool:

variables:
#version: '1.0.0.$(Build.BuildId)'
semanticVersion: "1.0.0"
solution: '**/*.sln'
buildPlatform: 'x64'
buildConfiguration: 'Release'
Expand All @@ -26,6 +27,13 @@ steps:
script: 'env | sort'
displayName: 'Display environment variables'

- task: PowerShell@2
inputs:
targetType: filePath
filePath: $(System.DefaultWorkingDirectory)\versionnumber.ps1
arguments: $(Build.SourcesDirectory) $(semanticVersion) $(Build.BuildId) $$(isPrerelease)
displayName: 'Setting build version'

- task: NuGetToolInstaller@1

- task: NuGetCommand@2
Expand Down
46 changes: 46 additions & 0 deletions versionnumber.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[CmdletBinding()]
Param(
[Parameter(Mandatory=$true, Position=0)]
[string]$SourceDir,
[Parameter(Mandatory=$true, Position=1)]
[string]$SemanticVersion,
[Parameter(Mandatory=$true, Position=2)]
[string]$BuildId,
[Parameter(Mandatory=$true, Position=3)]
[bool]$IsPrerelease
)

Write-Host "SemanticVersion = $SemanticVersion"
Write-Host "BuildId = $BuildId"

$local:BuildNumber = ($BuildId % 65535) # max value for version part on Windows is 65534
Write-Host "BuildNumber = $($local:BuildNumber)"

$local:PackageCodeMarker = "255.255.65534"
$local:AssemblyCodeMarker = "255.255.65534.65534"
$local:AssemblyVersion = "${SemanticVersion}.$($local:BuildNumber)"
$local:PwShellVersion = "${SemanticVersion}.$($BuildId)"
if ($IsPrerelease)
{
$local:PackageVersion = "${SemanticVersion}-dev-$($local:BuildNumber)"
}
else
{
$local:PackageVersion = $SemanticVersion
}
Write-Host "PackageCodeMarker = $($local:PackageCodeMarker)"
Write-Host "AssemblyCodeMarker = $($local:AssemblyCodeMarker)"
Write-Host "PackageVersion = $($local:PackageVersion)"
Write-Host "AssemblyVersion = $($local:AssemblyVersion)"
Write-Host "PwShellVersion = $($local:PwShellVersion)"

Write-Host "Replacing version information in RemoteApplicationPublisher assembly info"
$local:ProjectFile = (Join-Path $PSScriptRoot "RemoteApplicationPublisher\Properties\AssemblyInfo.cs")
(Get-Content $local:ProjectFile -Raw).replace($local:AssemblyCodeMarker, $local:AssemblyVersion) | Set-Content -Encoding UTF8 $local:ProjectFile
(Get-Content $local:ProjectFile -Raw).replace($local:PackageCodeMarker, $local:PackageVersion) | Set-Content -Encoding UTF8 $local:ProjectFile
Write-Output "*****"
Get-Content $local:ProjectFile
Write-Output "*****"

Write-Output "##vso[task.setvariable variable=VersionString;]$($local:AssemblyVersion)"
Write-Output "##vso[task.setvariable variable=PwShellVersionString;]$($local:PwShellVersion)"