Move build scripts and files from src\eng\build to build (#2)

This commit is contained in:
Jake Friedman 2020-07-23 13:31:06 -07:00 коммит произвёл GitHub
Родитель 5eef0dea58
Коммит 8ae3391826
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
26 изменённых файлов: 92 добавлений и 84 удалений

0
src/.gitignore → .gitignore поставляемый
Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -1,6 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT license.
# This script is used to auto-generate the FactoryOrchestratorClient implementation of IFactoryOrchestratorService (IPCInterface.cs)
Param
(
[string]$InterfaceName,
@ -13,7 +14,6 @@ Write-Host "Autogenerating $OutputFile from $InterfaceName interface in $Interfa
$file = Get-Item -Path "$InterfaceFile"
$interfaceContent = Get-Content $file.FullName
$inInterface = $false
$inSummary = $true
$indent = " "
[string]$outputContent = ""
$currentSummary = @()
@ -25,18 +25,15 @@ foreach ($line in $interfaceContent)
if ($line -like "*/// <summary>*")
{
# add to methodSummaries
$inSummary = $true
$currentSummary += "$line`n"
}
elseif ($line -like "*///*")
{
# add to methodSummaries
$inSummary = $true
$currentSummary += "$line`n"
}
elseif ($line -like "*;")
{
$inSummary = $false
# write out summary
foreach ($summ in $currentSummary)
{

Просмотреть файл

@ -1,6 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT license.
# This script sets the major and minor version numbers of all FactoryOrchestrator binaries based on src\custom.props
Param
(
[string]$SrcPath,
@ -15,15 +16,15 @@ Write-Host "Generating AssemblyInfo.cs for $SrcPath"
$buildNumber = $env:TFS_VersionNumber
$tfs = $false
[xml]$customprops = Get-Content "$PSScriptRoot\..\..\custom.props"
[xml]$customprops = Get-Content "$PSScriptRoot\..\src\custom.props"
$msbldns = "http://schemas.microsoft.com/developer/msbuild/2003"
$ns = @{msbld = "$msbldns"}
$majorNode = Select-Xml -Xml $customprops -XPath "//msbld:VersionMajor" -Namespace $ns | Select -First 1
$minorNode = Select-Xml -Xml $customprops -XPath "//msbld:VersionMinor" -Namespace $ns | Select -First 1
$majorNode = Select-Xml -Xml $customprops -XPath "//msbld:VersionMajor" -Namespace $ns | Select-Object -First 1
$minorNode = Select-Xml -Xml $customprops -XPath "//msbld:VersionMinor" -Namespace $ns | Select-Object -First 1
$majorVersion = $majorNode.Node."#text"
$minorVersion = $minorNode.Node."#text"
if ($buildNumber -eq $null)
if ($null -eq $buildNumber)
{
$date = Get-Date
$month = $date.Month.ToString()
@ -58,22 +59,22 @@ Write-Host "Using temp file $tempFile"
if ($tfs -eq $true)
{
Get-Content $file.FullName |
%{$_ -replace 'AssemblyDescription.+', "AssemblyDescription("""")]" } > $tempFile
ForEach-Object{$_ -replace 'AssemblyDescription.+', "AssemblyDescription("""")]" } > $tempFile
}
else
{
Write-Host "Creating assembly info file for:" $file.FullName " build number:" $buildNumber
Get-Content $file.FullName |
%{$_ -replace 'AssemblyVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)', "AssemblyVersion(""$buildNumber"")" } |
%{$_ -replace 'AssemblyFileVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)', "AssemblyFileVersion(""$buildNumber"")" } |
%{$_ -replace 'AssemblyDescription.+', "AssemblyDescription(""PrivateBuild"")]" } > $tempFile
ForEach-Object{$_ -replace 'AssemblyVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)', "AssemblyVersion(""$buildNumber"")" } |
ForEach-Object{$_ -replace 'AssemblyFileVersion\("[0-9]+(\.([0-9]+|\*)){1,3}"\)', "AssemblyFileVersion(""$buildNumber"")" } |
ForEach-Object{$_ -replace 'AssemblyDescription.+', "AssemblyDescription(""PrivateBuild"")]" } > $tempFile
}
Write-Host "Sucessfully modified $tempFile"
$destDir = $file.DirectoryName + "\..\obj\"
$dir = New-Item -Path $destDir -ItemType Directory -Force
$null = New-Item -Path $destDir -ItemType Directory -Force
$destFile = $destDir + $file.Name
$skip = $false

Просмотреть файл

@ -21,12 +21,12 @@ $ns = @{wmxml = "$wmxmlNs"}
Write-Host "Creating manifest $OutputFile from $PublishFolder"
# Set manifest info
$rootNode = Select-Xml -Xml $templateXml -XPath "//wmxml:identity" -Namespace $ns | Select -First 1
$rootNode = Select-Xml -Xml $templateXml -XPath "//wmxml:identity" -Namespace $ns | Select-Object -First 1
$rootNode.Node.SetAttribute("owner", "$Owner")
$rootNode.Node.SetAttribute("namespace", "$Namespace")
$rootNode.Node.SetAttribute("name", "$Name")
$filesNode = Select-Xml -Xml $templateXml -XPath "//wmxml:files" -Namespace $ns | Select -First 1
$filesNode = Select-Xml -Xml $templateXml -XPath "//wmxml:files" -Namespace $ns | Select-Object -First 1
[System.IO.DirectoryInfo] $PublishDir = $PublishFolder
$filesToAdd = Get-ChildItem $PublishFolder -Recurse -File
@ -63,7 +63,7 @@ foreach ($file in $filesToAdd)
$newElement = $templateXml.CreateElement("file", $wmxmlNs)
$newElement.SetAttribute("destinationDir", "$fileDestinationDir")
$newElement.SetAttribute("source", "$source")
$node = $filesNode.Node.AppendChild($newElement)
$null = $filesNode.Node.AppendChild($newElement)
Write-Host "Added $($file.FullName)."
Write-Host "---source: $source"
Write-Host "---destinationDir: $fileDestinationDir"

Просмотреть файл

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -81,7 +81,7 @@ steps:
- task: VSTest@1
displayName: 'Test Assemblies *test*.dll'
inputs:
testAssembly: '$(Build.SourcesDirectory)\**\*test*.dll;-:**\obj\**'
testAssembly: '$(Build.SourcesDirectory)\src\**\*test*.dll;-:**\obj\**'
codeCoverageEnabled: true
runInParallel: False
vsTestVersion: latest
@ -92,7 +92,7 @@ steps:
inputs:
command: publish
publishWebProjects: False
arguments: '$(Build.SourcesDirectory)\Service\FactoryOrchestratorService.csproj --configuration $(BuildConfiguration) --output $(Build.SourcesDirectory)\bin\release\x86\FactoryOrchestratorService_SCD --self-contained --runtime win-x86 --verbosity Detailed'
arguments: '$(Build.SourcesDirectory)\src\Service\FactoryOrchestratorService.csproj --configuration $(BuildConfiguration) --output $(Build.SourcesDirectory)\bin\release\x86\FactoryOrchestratorService_SCD --self-contained --runtime win-x86 --verbosity Detailed'
zipAfterPublish: False
condition: eq(variables['BuildConfiguration'], 'Release')
enabled: true
@ -102,7 +102,7 @@ steps:
inputs:
command: publish
publishWebProjects: False
arguments: '$(Build.SourcesDirectory)\Service\FactoryOrchestratorService.csproj --configuration $(BuildConfiguration) --output $(Build.SourcesDirectory)\bin\release\x64\FactoryOrchestratorService_SCD --self-contained --runtime win-x64 --verbosity Detailed'
arguments: '$(Build.SourcesDirectory)\src\Service\FactoryOrchestratorService.csproj --configuration $(BuildConfiguration) --output $(Build.SourcesDirectory)\bin\release\x64\FactoryOrchestratorService_SCD --self-contained --runtime win-x64 --verbosity Detailed'
zipAfterPublish: False
condition: eq(variables['BuildConfiguration'], 'Release')
enabled: true
@ -112,7 +112,7 @@ steps:
inputs:
command: publish
publishWebProjects: False
arguments: '$(Build.SourcesDirectory)\Service\FactoryOrchestratorService.csproj --configuration $(BuildConfiguration) --output $(Build.SourcesDirectory)\bin\release\ARM\FactoryOrchestratorService_SCD --self-contained --runtime win-arm --verbosity Detailed'
arguments: '$(Build.SourcesDirectory)\src\Service\FactoryOrchestratorService.csproj --configuration $(BuildConfiguration) --output $(Build.SourcesDirectory)\bin\release\ARM\FactoryOrchestratorService_SCD --self-contained --runtime win-arm --verbosity Detailed'
zipAfterPublish: False
condition: eq(variables['BuildConfiguration'], 'Release')
enabled: true
@ -122,7 +122,7 @@ steps:
inputs:
command: publish
publishWebProjects: False
arguments: '$(Build.SourcesDirectory)\Service\FactoryOrchestratorService.csproj --configuration $(BuildConfiguration) --output $(Build.SourcesDirectory)\bin\release\ARM64\FactoryOrchestratorService_SCD --self-contained --runtime win-arm64 --force --verbosity Detailed'
arguments: '$(Build.SourcesDirectory)\src\Service\FactoryOrchestratorService.csproj --configuration $(BuildConfiguration) --output $(Build.SourcesDirectory)\bin\release\ARM64\FactoryOrchestratorService_SCD --self-contained --runtime win-arm64 --force --verbosity Detailed'
zipAfterPublish: false
condition: eq(variables['BuildConfiguration'], 'Release')
enabled: true
@ -131,7 +131,7 @@ steps:
displayName: 'Create FactoryOrchestratorService Manifest for VPack'
inputs:
targetType: filePath
filePath: ./eng/build/CreateServiceManifestForPkgES.ps1
filePath: ./build/internal/CreateServiceManifestForPkgES.ps1
arguments: '-BuildConfiguration $(BuildConfiguration) -BinFolder $(Build.SourcesDirectory)\bin -NtTreeRootFolder manufacturing\FactoryOrchestrator'
failOnStderr: true
condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'))
@ -179,7 +179,7 @@ steps:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
displayName: 'Run script MakeAppxBundle.cmd'
inputs:
filename: eng/build/MakeAppxBundle.cmd
filename: build/internal/MakeAppxBundle.cmd
condition: and(succeeded(), and(eq(variables['XES_SERIALPOSTBUILDREADY'], 'True'), ne(variables['skipmsix'], 'true')))
enabled: true
@ -296,7 +296,7 @@ steps:
- task: CopyFiles@2
displayName: 'Copy IPC License to Client Libraries'
inputs:
SourceFolder: '$(Build.SourcesDirectory)\oss'
SourceFolder: '$(Build.SourcesDirectory)\src\oss'
Contents: 'IpcServiceFramework.txt'
TargetFolder: '$(XES_DFSDROP)\ClientLibraries'
condition: and(succeeded(), eq(variables['XES_SERIALPOSTBUILDREADY'], 'True'))
@ -304,7 +304,7 @@ steps:
- task: CopyFiles@2
displayName: 'Copy XSD to Client Libraries'
inputs:
SourceFolder: '$(Build.SourcesDirectory)\CoreLibrary'
SourceFolder: '$(Build.SourcesDirectory)\src\CoreLibrary'
Contents: 'FactoryOrchestratorXML.xsd'
TargetFolder: '$(XES_DFSDROP)\ClientLibraries'
condition: and(succeeded(), eq(variables['XES_SERIALPOSTBUILDREADY'], 'True'))
@ -338,7 +338,7 @@ steps:
- task: CopyFiles@2
displayName: 'Copy Client Sample to root of drop'
inputs:
SourceFolder: '$(Build.SourcesDirectory)\ClientSample'
SourceFolder: '$(Build.SourcesDirectory)\src\ClientSample'
Contents: |
**\*.cs
**\*.csproj
@ -349,7 +349,7 @@ steps:
displayName: 'Modify Client Sample for WSK'
inputs:
targetType: filePath
filePath: ./eng/build/UpdateClientSampleForWSK.ps1
filePath: ./build/internal/UpdateClientSampleForWSK.ps1
arguments: '-ProjectFolder $(XES_DFSDROP)\ClientSampleWSK'
failOnStderr: true
condition: and(succeeded(), eq(variables['XES_SERIALPOSTBUILDREADY'], 'True'))
@ -382,14 +382,14 @@ steps:
displayName: 'Run PoliCheck'
inputs:
targetType: F
optionsUEPATH: '$(Build.SourcesDirectory)\eng\build\PolicheckExclusions.xml'
optionsUEPATH: '$(Build.SourcesDirectory)\build\config\PolicheckExclusions.xml'
condition: and(succeededOrFailed(), eq(variables['XES_SERIALPOSTBUILDREADY'], 'True'))
- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
displayName: 'Run CredScan'
inputs:
debugMode: false
suppressionsFile: 'eng/build/CredScanSuppressions.json'
suppressionsFile: 'build/config/CredScanSuppressions.json'
condition: and(succeededOrFailed(), eq(variables['XES_SERIALPOSTBUILDREADY'], 'True'))
- task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
@ -405,7 +405,7 @@ steps:
iterationPath: 'OS'
bugTags: 'FactoryOrchestrator'
scanAll: false
checkInConfigPath: 'eng/build/GitCheckin.json'
checkInConfigPath: 'build/internal/GitCheckin.json'
taskLogVerbosity: Diagnostic
condition: and(succeededOrFailed(), and(eq(variables['XES_SERIALPOSTBUILDREADY'], 'True'), ne(variables['skipvpack'], 'true')))
enabled: false
@ -427,7 +427,7 @@ steps:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
displayName: 'Package ES - Create PR for VPack Manifest to OS Repo'
inputs:
configPath: 'eng/build/GitCheckin.json'
configPath: 'build/internal/GitCheckin.json'
binVersion: Custom
binVersionOverride: 'Production'
condition: and(and(succeeded(), eq(variables['XES_SERIALPOSTBUILDREADY'], 'True')), and(ne(variables['skipgitsubmit'], 'true'), ne(variables['skipvpack'], 'true')))

Просмотреть файл

Просмотреть файл

@ -98,7 +98,7 @@
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' == ''">
<OutputPath>..\bin\$(Configuration)\$(Platform)\$(AssemblyName)</OutputPath>
<OutputPath>..\..\bin\$(Configuration)\$(Platform)\$(AssemblyName)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
<OutputPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\bin\$(Configuration)\$(Platform)\$(AssemblyName)</OutputPath>
@ -291,17 +291,14 @@
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<Target Name="BeforeBuildPS_VSO" BeforeTargets="Build;CoreCompile;XefVersionResourceCompile;XamlPreCompile" Condition="'$(IsTFSBuild)' == 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
</Target>
<Target Name="BeforeBuildPS_Local" BeforeTargets="Build;CoreCompile;XefVersionResourceCompile;XamlPreCompile" Condition="'$(IsTFSBuild)' != 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
</Target>
<Target Name="AfterBuild" Condition="'$(IsTFSBuild)' == 'true'">
<Copy SourceFiles="$(AppxPackageOutput)" DestinationFolder="$(OutputPath)" />
</Target>
<!-- <PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
<PostBuildEvent>robocopy /s $(ProjectDir)AppPackages $(ProjectDir)$(OutDir)AppPackages</PostBuildEvent>
</PropertyGroup> -->
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

Просмотреть файл

@ -6,8 +6,8 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' == ''">
<OutputPath>..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<DocumentationFile>..\bin\$(Configuration)\$(Platform)\$(TargetName)\$(TargetName).xml</DocumentationFile>
<OutputPath>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<DocumentationFile>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)\$(TargetName).xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
<OutputPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
@ -31,9 +31,9 @@
</ItemGroup>
<Target Name="BeforeBuildPS_VSO" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' == 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
</Target>
<Target Name="BeforeBuildPS_Local" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' != 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
</Target>
</Project>

Просмотреть файл

@ -8,7 +8,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' == ''">
<OutputPath>..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<OutputPath>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
<OutputPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
@ -24,10 +24,10 @@
</ItemGroup>
<Target Name="BeforeBuildPS_VSO" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' == 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
</Target>
<Target Name="BeforeBuildPS_Local" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' != 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
</Target>
</Project>

Просмотреть файл

@ -6,8 +6,8 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' == ''">
<OutputPath>..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<DocumentationFile>..\bin\$(Configuration)\$(Platform)\$(TargetName)\$(TargetName).xml</DocumentationFile>
<OutputPath>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<DocumentationFile>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)\$(TargetName).xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
<OutputPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
@ -32,15 +32,15 @@
<Compile Remove="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Target Name="BeforeBuildPS_VSO" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' == 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
<Target Name="BeforeBuildPS_VSO" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' == 'true' Or '$(Configuration)' == 'Release'">
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
</Target>
<Target Name="BeforeBuildPS_Local" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' != 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
<Target Name="BeforeBuildPS_Local" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' != 'true' And '$(Configuration)' == 'Debug'">
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
</Target>
<Target Name="AfterBuildPS" AfterTargets="Build">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\AutoGenerateInterfaceHelper.ps1 -InterfaceName IFactoryOrchestratorService -InterfaceFile $(ProjectDir)IPCInterface.cs -TemplateFile $(ProjectDir)ClientTemplate\IPCInterfaceHelperTemplate.cs -OutputFile $(ProjectDir)..\ClientLibrary\FactoryOrchestratorClientAutogenerated.cs" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\AutoGenerateInterfaceHelper.ps1 -InterfaceName IFactoryOrchestratorService -InterfaceFile $(ProjectDir)IPCInterface.cs -TemplateFile $(ProjectDir)ClientTemplate\IPCInterfaceHelperTemplate.cs -OutputFile $(ProjectDir)..\ClientLibrary\FactoryOrchestratorClientAutogenerated.cs" />
</Target>
</Project>

Просмотреть файл

@ -11,28 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FactoryOrchestratorApp", "A
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FactoryOrchestratorClientLibrary", "ClientLibrary\FactoryOrchestratorClientLibrary.csproj", "{C5FDA4E1-E631-47B2-BA5F-6558F8506DF7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC551A63-2CD3-4680-AA7B-2E5BABA1C9CE}"
ProjectSection(SolutionItems) = preProject
eng\build\AutoGenerateInterfaceHelper.ps1 = eng\build\AutoGenerateInterfaceHelper.ps1
eng\build\CreateServiceManifest.ps1 = eng\build\CreateServiceManifest.ps1
eng\build\CreateServiceManifestForPkgES.ps1 = eng\build\CreateServiceManifestForPkgES.ps1
eng\build\CredScanSuppressions.json = eng\build\CredScanSuppressions.json
custom.props = custom.props
Directory.Build.props = Directory.Build.props
eng\build\FactoryOrchestratorServiceTemplate.wm.xml = eng\build\FactoryOrchestratorServiceTemplate.wm.xml
eng\build\ftf-ci-hosted.yml = eng\build\ftf-ci-hosted.yml
eng\build\ftf-pkges-vpack.yml = eng\build\ftf-pkges-vpack.yml
eng\build\GitCheckin.json = eng\build\GitCheckin.json
eng\build\MakeAppxBundle.cmd = eng\build\MakeAppxBundle.cmd
eng\build\PolicheckExclusions.xml = eng\build\PolicheckExclusions.xml
README.md = README.md
eng\build\SetSourceVersion.ps1 = eng\build\SetSourceVersion.ps1
StartAppDebug.cmd = StartAppDebug.cmd
StartSampleDebug.cmd = StartSampleDebug.cmd
StartServiceDebug.cmd = StartServiceDebug.cmd
eng\build\UpdateClientSampleForWSK.ps1 = eng\build\UpdateClientSampleForWSK.ps1
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FactoryOrchestratorServerLibrary", "ServerLibrary\FactoryOrchestratorServerLibrary.csproj", "{3F3AD59B-1E8A-4B01-BAE5-D6DABAF43DE1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IpcServiceFramework.Client", "oss\ipcframework\IpcServiceFramework.Client\IpcServiceFramework.Client.csproj", "{52CEB7ED-27E4-40DF-810F-4971CAF0F55E}"
@ -57,6 +35,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OSS", "OSS", "{AB6C2AD9-125
oss\IpcServiceFramework.txt = oss\IpcServiceFramework.txt
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{492B979A-F7D2-40A1-B311-1416F9CE7A2A}"
ProjectSection(SolutionItems) = preProject
..\build\AutoGenerateInterfaceHelper.ps1 = ..\build\AutoGenerateInterfaceHelper.ps1
..\build\azure-pipelines.pr.yml = ..\build\azure-pipelines.pr.yml
..\build\azure-pipelines.release.yml = ..\build\azure-pipelines.release.yml
..\build\azure-pipelines.yml = ..\build\azure-pipelines.yml
custom.props = custom.props
..\build\SetSourceVersion.ps1 = ..\build\SetSourceVersion.ps1
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "internal", "internal", "{A33F40C3-2BAD-406E-86BE-DBE33F12BB29}"
ProjectSection(SolutionItems) = preProject
build\internal\CreateServiceManifest.ps1 = build\internal\CreateServiceManifest.ps1
build\internal\CreateServiceManifestForPkgES.ps1 = build\internal\CreateServiceManifestForPkgES.ps1
build\internal\FactoryOrchestratorServiceTemplate.wm.xml = build\internal\FactoryOrchestratorServiceTemplate.wm.xml
build\internal\ftf-ci-hosted.yml = build\internal\ftf-ci-hosted.yml
build\internal\ftf-pkges-vpack.yml = build\internal\ftf-pkges-vpack.yml
build\internal\GitCheckin.json = build\internal\GitCheckin.json
build\internal\MakeAppxBundle.cmd = build\internal\MakeAppxBundle.cmd
build\internal\UpdateClientSampleForWSK.ps1 = build\internal\UpdateClientSampleForWSK.ps1
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{B4F05BFC-A45E-4400-814A-12DA0D6FA3D0}"
ProjectSection(SolutionItems) = preProject
build\CredScanSuppressions.json = build\CredScanSuppressions.json
build\PolicheckExclusions.xml = build\PolicheckExclusions.xml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{0FD8AFF8-3868-4FD5-A8A6-DA8DAA02B52F}"
ProjectSection(SolutionItems) = preProject
..\build\templates\template-build-all-arch.yml = ..\build\templates\template-build-all-arch.yml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -240,6 +251,9 @@ Global
{85F00E28-CD14-4FAD-BD5A-A78B3AE4F57E} = {BB6182E5-4177-44D4-A7E8-2590D00941AE}
{75CE917D-7640-4B7C-A25B-5EBCD14FE21D} = {BB6182E5-4177-44D4-A7E8-2590D00941AE}
{EC92FDBB-93C1-4F42-ABF6-B4A5D01DD571} = {BB6182E5-4177-44D4-A7E8-2590D00941AE}
{A33F40C3-2BAD-406E-86BE-DBE33F12BB29} = {492B979A-F7D2-40A1-B311-1416F9CE7A2A}
{B4F05BFC-A45E-4400-814A-12DA0D6FA3D0} = {492B979A-F7D2-40A1-B311-1416F9CE7A2A}
{0FD8AFF8-3868-4FD5-A8A6-DA8DAA02B52F} = {492B979A-F7D2-40A1-B311-1416F9CE7A2A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DDE1E8F8-AA02-4732-8297-525697F8BEDA}

Просмотреть файл

@ -1 +0,0 @@

Просмотреть файл

@ -6,7 +6,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' == ''">
<OutputPath>..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<OutputPath>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
<OutputPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
@ -24,9 +24,9 @@
</ItemGroup>
<Target Name="BeforeBuildPS_VSO" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' == 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
</Target>
<Target Name="BeforeBuildPS_Local" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' != 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
</Target>
</Project>

Просмотреть файл

@ -8,7 +8,7 @@
<RuntimeIdentifiers>win-x64;win-x86;win-arm;win-arm64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' == ''">
<OutputPath>..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<OutputPath>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
<OutputPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
@ -41,10 +41,10 @@
</ItemGroup>
<Target Name="BeforeBuildPS_VSO" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' == 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
</Target>
<Target Name="BeforeBuildPS_Local" BeforeTargets="Build;CoreCompile" Condition="'$(IsTFSBuild)' != 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
</Target>
</Project>

Просмотреть файл

@ -39,8 +39,8 @@
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' == ''">
<OutputPath>..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<DocumentationFile>..\bin\$(Configuration)\$(Platform)\$(TargetName)\$(TargetName).XML</DocumentationFile>
<OutputPath>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
<DocumentationFile>..\..\bin\$(Configuration)\$(Platform)\$(TargetName)\$(TargetName).XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
<OutputPath>$(BUILD_ARTIFACTSTAGINGDIRECTORY)\bin\$(Configuration)\$(Platform)\$(TargetName)</OutputPath>
@ -71,10 +71,10 @@
</ItemGroup>
<Target Name="BeforeBuildPS_VSO" BeforeTargets="Build;CoreCompile;XefVersionResourceCompile" Condition="'$(IsTFSBuild)' == 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir)" />
</Target>
<Target Name="BeforeBuildPS_Local" BeforeTargets="Build;CoreCompile;XefVersionResourceCompile" Condition="'$(IsTFSBuild)' != 'true'">
<Exec Command="Powershell.exe $(ProjectDir)..\eng\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
<Exec Command="Powershell.exe $(ProjectDir)..\..\build\SetSourceVersion.ps1 -SrcPath $(ProjectDir) -MajorMinorOnly" />
</Target>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />