d
This commit is contained in:
parent
631b24ff0d
commit
b4c99e913e
@ -27,17 +27,17 @@
|
||||
<Content Remove="compilerconfig.json" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapper" Version="2.0.143" />
|
||||
<PackageReference Include="Dapper" Version="2.1.15" />
|
||||
<PackageReference Include="EntityFramework" Version="6.4.4" />
|
||||
<PackageReference Include="jQuery" Version="3.7.0" />
|
||||
<PackageReference Include="jQuery" Version="3.7.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore.Ingestion" Version="1.0.0-dev-00032" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="6.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
<PropertyGroup Label="Globals">
|
||||
<SccProjectName>SAK</SccProjectName>
|
||||
<SccProvider>SAK</SccProvider>
|
||||
@ -24,25 +24,22 @@
|
||||
<Content Remove="compilerconfig.json" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapper" Version="2.0.143" />
|
||||
<PackageReference Include="Dapper" Version="2.1.15" />
|
||||
<PackageReference Include="EntityFramework" Version="6.4.4" />
|
||||
<PackageReference Include="jQuery" Version="3.7.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
|
||||
<PackageReference Include="jQuery" Version="3.7.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="6.0.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="Serilog.AspNetCore.Ingestion" Version="1.0.0-dev-00032" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Shared\OI.Metrology.Shared.csproj" />
|
||||
@ -56,12 +53,6 @@
|
||||
<None Include="compilerconfig.json" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="appsettings.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="appsettings.Development.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Mike\service-shop.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
@ -92,18 +83,6 @@
|
||||
<None Include="Data\Tests\InfinityQS-GetCommandText.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQS-GetData.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQS-GetDescriptors.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQS-GetEvents.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQS-GetHeader.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQSV2-GetCommandText.sql">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
@ -119,6 +98,21 @@
|
||||
<None Include="Data\Tests\InfinityQSV2-GetHeader.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQSV3-GetData.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQSV3-GetDescriptors.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQSV3-GetHeader.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\InfinityQSV3-GetProductDataAverageSumOfDefectsProcessMeanProcessSigma.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\OpenInsightV1-GetTencorRun.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\Pin-GetPinnedTable.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
@ -134,10 +128,10 @@
|
||||
<None Include="Data\Tests\ToolTypes-GetHeaderFields.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\ToolTypes-GetHeaderTitles.json">
|
||||
<None Include="Data\Tests\ToolTypes-GetHeaders.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\ToolTypes-GetHeaders.json">
|
||||
<None Include="Data\Tests\ToolTypes-GetHeaderTitles.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="Data\Tests\ToolTypes-GetToolTypeMetadata.json">
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
{
|
||||
"AllowedHosts": "*",
|
||||
"ApiExportPath": "\\\\mesfs.infineon.com\\EC_Metrology_Si",
|
||||
"ApiLoggingContentTypes": "application/json",
|
||||
"ApiLoggingPathPrefixes": "/api/inbound",
|
||||
"ApiUrl": "~/api",
|
||||
"ApiLogPath": "D:\\Metrology\\MetrologyAPILogs",
|
||||
"AttachmentPath": "\\\\mesfs.infineon.com\\EC_Metrology_Si\\MetrologyAttachments",
|
||||
"BuildNumber": "1",
|
||||
"Company": "Infineon Technologies Americas Corp.",
|
||||
"ConnectionString": "Data Source=messqlec1.infineon.com\\PROD1,53959;Integrated Security=True;Initial Catalog=Metrology;",
|
||||
"GitCommitSeven": "1234567",
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft": "Warning",
|
||||
"Log4netProvider": "Debug",
|
||||
"Microsoft.Hosting.Lifetime": "Information"
|
||||
}
|
||||
},
|
||||
"InboundApiAllowedIPList": "",
|
||||
"IsDevelopment": false,
|
||||
"IsStaging": false,
|
||||
"MockRoot": "",
|
||||
"MonAResource": "OI_Metrology_Viewer_EC",
|
||||
"MonASite": "auc",
|
||||
"Oi2SqlConnectionString": "Data Source=messqlec1.infineon.com\\PROD1,53959;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;",
|
||||
"Serilog": {
|
||||
"Using": [
|
||||
"Serilog.Sinks.Console",
|
||||
"Serilog.Sinks.File"
|
||||
],
|
||||
"MinimumLevel": "Information",
|
||||
"WriteTo": [
|
||||
{
|
||||
"Name": "Debug",
|
||||
"Args": {
|
||||
"outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName}) ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Name": "Console",
|
||||
"Args": {
|
||||
"outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName}) ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Name": "File",
|
||||
"Args": {
|
||||
"path": "%workingDirectory% - Log/log-.txt",
|
||||
"outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] ({SourceContext}.{MethodName}) ({InstanceId}) ({RemoteIpAddress}) {Message}{NewLine}{Exception}",
|
||||
"rollingInterval": "Hour"
|
||||
}
|
||||
}
|
||||
],
|
||||
"Enrich": [
|
||||
"FromLogContext",
|
||||
"WithMachineName",
|
||||
"WithThreadId"
|
||||
],
|
||||
"Properties": {
|
||||
"Application": "Sample"
|
||||
}
|
||||
},
|
||||
"TableToPath": {
|
||||
"SPVRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08ANLYSDIFAAST230\\Source",
|
||||
"TencorRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08DDUPSFS6420\\Source",
|
||||
"SP1RunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08DDUPSP1TBI\\Source",
|
||||
"MercuryProbeRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08RESIHGCV\\Source",
|
||||
"CDERunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08RESIMAPCDE\\Source",
|
||||
"SRPRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08RESISRP2100\\Source",
|
||||
"BioRadRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08THFTIRQS408M\\Source",
|
||||
"StratusBioRadRunHeader": "\\\\messa01ec.infineon.com\\apps\\Metrology\\MET08THFTIRSTRATUS\\Source"
|
||||
},
|
||||
"URLs": "http://localhost:5002;",
|
||||
"WorkingDirectoryName": "IFXApps"
|
||||
}
|
||||
@ -1027,8 +1027,22 @@ function oiExportButtonRunInfo() {
|
||||
});
|
||||
}
|
||||
|
||||
function setInitialDateTimesRunInfo() {
|
||||
var startTime = new Date(Date.now() - 6 * 60 * 60 * 1000);//6 hours back from now
|
||||
function setInitialDateTimesRunInfo(milliseconds) {
|
||||
if (!milliseconds)
|
||||
{
|
||||
var startDate = $("#StartDate").igDatePicker("value");
|
||||
var startTime = $("#StartTime").igTimePicker("value");
|
||||
var endDate = $("#EndDate").igDatePicker("value");
|
||||
var endTime = $("#EndTime").igTimePicker("value");
|
||||
var startDateTime = new Date(
|
||||
startDate.getFullYear(), startDate.getMonth(), startDate.getDate(),
|
||||
startTime.getHours(), startTime.getMinutes(), startTime.getSeconds());
|
||||
var endDateTime = new Date(
|
||||
endDate.getFullYear(), endDate.getMonth(), endDate.getDate(),
|
||||
endTime.getHours(), endTime.getMinutes(), endTime.getSeconds());
|
||||
milliseconds = Math.abs(endDateTime - startDateTime);
|
||||
}
|
||||
var startTime = new Date(Date.now() - milliseconds);
|
||||
$("#StartDate").igDatePicker({
|
||||
dateInputFormat: "date",
|
||||
value: startTime,
|
||||
@ -1079,7 +1093,7 @@ function initRunInfo(apiUrl, initialToolTypeID, initialHeaderId, initialHeaderAt
|
||||
initialSelectedItems: [{ value: initialToolTypeID }]
|
||||
});
|
||||
});
|
||||
setInitialDateTimesRunInfo();
|
||||
setInitialDateTimesRunInfo(6 * 60 * 60 * 1000);
|
||||
$("#HeaderGrid").on("dblclick", "tr", loadDetailsRunInfo);
|
||||
$("#LoadHeadersButton").click(loadHeaderGridRunInfo);
|
||||
$("#GetDataButton").click(loadDetailsRunInfo);
|
||||
@ -1090,7 +1104,7 @@ function initRunInfo(apiUrl, initialToolTypeID, initialHeaderId, initialHeaderAt
|
||||
$("#OIExportButton").click(oiExportButtonRunInfo);
|
||||
setInterval(function () {
|
||||
if ($("#chkAutoRefresh").is(':checked')) {
|
||||
setInitialDateTimesRunInfo();
|
||||
setInitialDateTimesRunInfo(null);
|
||||
$("#LoadHeadersButton").click();
|
||||
}
|
||||
}, 180000);
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<LangVersion>10.0</LangVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
<PropertyGroup>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<IsPackable>false</IsPackable>
|
||||
<LangVersion>10.0</LangVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
@ -46,12 +45,6 @@
|
||||
<ProjectReference Include="..\Server\OI.Metrology.Server.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\Server\appsettings.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\Server\appsettings.Development.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="..\.Data\RdsMaxRepo.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
<SupportedPlatform Include="browser" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="MudBlazor" Version="6.7.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.9" />
|
||||
<PackageReference Include="MudBlazor" Version="6.11.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.13" />
|
||||
<PackageReference Include="IgniteUI.Blazor" Version="22.2.24" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.BrowserConsole" Version="1.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.BrowserConsole" Version="2.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.BrowserHttp" Version="1.0.0-dev-00032" />
|
||||
<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
@ -15,7 +15,7 @@ trigger:
|
||||
- "ClientHub/*"
|
||||
|
||||
pool:
|
||||
name: Mesa-IIS
|
||||
name: eaf
|
||||
demands: OI-Metrology-Server-Development
|
||||
|
||||
variables:
|
||||
|
||||
@ -21,238 +21,238 @@ variables:
|
||||
ASPNETCORE_ENVIRONMENT: "Production"
|
||||
|
||||
stages:
|
||||
- stage: IFX
|
||||
# - stage: IFX
|
||||
|
||||
pool:
|
||||
name: Mesa-Windows-Service
|
||||
demands: OI-Metrology-Server-IFX
|
||||
# pool:
|
||||
# name: eaf
|
||||
# demands: OI-Metrology-Server-IFX
|
||||
|
||||
jobs:
|
||||
- job: IFX
|
||||
steps:
|
||||
- script: |
|
||||
set exeName=OI.Metrology.Server
|
||||
echo %exeName%
|
||||
echo ##vso[task.setvariable variable=ExeName;]%exeName%
|
||||
echo $(ExeName)
|
||||
displayName: ExeName
|
||||
# jobs:
|
||||
# - job: IFX
|
||||
# steps:
|
||||
# - script: |
|
||||
# set exeName=OI.Metrology.Server
|
||||
# echo %exeName%
|
||||
# echo ##vso[task.setvariable variable=ExeName;]%exeName%
|
||||
# echo $(ExeName)
|
||||
# displayName: ExeName
|
||||
|
||||
- script: |
|
||||
set coreVersion=net7.0
|
||||
echo %coreVersion%
|
||||
echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
|
||||
echo $(CoreVersion)
|
||||
displayName: CoreVersion
|
||||
# - script: |
|
||||
# set coreVersion=net7.0
|
||||
# echo %coreVersion%
|
||||
# echo ##vso[task.setvariable variable=CoreVersion;]%coreVersion%
|
||||
# echo $(CoreVersion)
|
||||
# displayName: CoreVersion
|
||||
|
||||
- script: |
|
||||
set configuration=Debug
|
||||
echo %configuration%
|
||||
echo ##vso[task.setvariable variable=Configuration;]%configuration%
|
||||
echo $(Configuration)
|
||||
displayName: Configuration
|
||||
# - script: |
|
||||
# set configuration=Debug
|
||||
# echo %configuration%
|
||||
# echo ##vso[task.setvariable variable=Configuration;]%configuration%
|
||||
# echo $(Configuration)
|
||||
# displayName: Configuration
|
||||
|
||||
- script: |
|
||||
set nugetSource=https://eaf-dev-reporting.mes.infineon.com/v3/index.json
|
||||
echo %nugetSource%
|
||||
echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
|
||||
echo $(NugetSource)
|
||||
displayName: NugetSource
|
||||
# - script: |
|
||||
# set nugetSource=https://eaf-dev-reporting.mes.infineon.com/v3/index.json
|
||||
# echo %nugetSource%
|
||||
# echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
|
||||
# echo $(NugetSource)
|
||||
# displayName: NugetSource
|
||||
|
||||
- script: |
|
||||
set gitCommit=$(Build.SourceVersion)
|
||||
set gitCommitSeven=%gitCommit:~0,7%
|
||||
echo %gitCommitSeven%
|
||||
echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
|
||||
echo $(GitCommitSeven)
|
||||
displayName: GitCommitSeven
|
||||
# - script: |
|
||||
# set gitCommit=$(Build.SourceVersion)
|
||||
# set gitCommitSeven=%gitCommit:~0,7%
|
||||
# echo %gitCommitSeven%
|
||||
# echo ##vso[task.setvariable variable=GitCommitSeven;]%gitCommitSeven%
|
||||
# echo $(GitCommitSeven)
|
||||
# displayName: GitCommitSeven
|
||||
|
||||
- script: |
|
||||
set uuId=A6302662940458499454E35D28FCC9F7
|
||||
echo %uuId%
|
||||
echo ##vso[task.setvariable variable=UUId;]%uuId%
|
||||
echo $(UUId)
|
||||
displayName: UUId
|
||||
# - script: |
|
||||
# set uuId=A6302662940458499454E35D28FCC9F7
|
||||
# echo %uuId%
|
||||
# echo ##vso[task.setvariable variable=UUId;]%uuId%
|
||||
# echo $(UUId)
|
||||
# displayName: UUId
|
||||
|
||||
- script: |
|
||||
set pwEncoding=AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAtBhT01pNnUGaN/uPLxZGvAAAAAACAAAAAAADZgAAwAAAABAAAAAM4xlYguhv7jzchU8dq9pVAAAAAASAAACgAAAAEAAAANS9rIoaYfNq5TwCmTrqElsgAAAA7O4J52FqCctXlCxYB2J5b/W4T+pZCN2zwFj7XCAFW6IUAAAAhQsBDOERAUZJdtSy8AfxwOAZflo=
|
||||
echo %pwEncoding%
|
||||
echo ##vso[task.setvariable variable=PwEncoding;]%pwEncoding%
|
||||
echo $(PwEncoding)
|
||||
displayName: PwEncoding
|
||||
# - script: |
|
||||
# set pwEncoding=AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAtBhT01pNnUGaN/uPLxZGvAAAAAACAAAAAAADZgAAwAAAABAAAAAM4xlYguhv7jzchU8dq9pVAAAAAASAAACgAAAAEAAAANS9rIoaYfNq5TwCmTrqElsgAAAA7O4J52FqCctXlCxYB2J5b/W4T+pZCN2zwFj7XCAFW6IUAAAAhQsBDOERAUZJdtSy8AfxwOAZflo=
|
||||
# echo %pwEncoding%
|
||||
# echo ##vso[task.setvariable variable=PwEncoding;]%pwEncoding%
|
||||
# echo $(PwEncoding)
|
||||
# displayName: PwEncoding
|
||||
|
||||
- script: |
|
||||
echo $(Build.BuildId)
|
||||
echo $(Build.Reason)
|
||||
echo $(Build.Repository.Id)
|
||||
echo $(Build.Repository.Name)
|
||||
echo $(Build.SourceVersion)
|
||||
echo $(Configuration)
|
||||
echo $(CoreVersion)
|
||||
echo $(GitCommitSeven)
|
||||
echo $(NugetSource)
|
||||
echo $(PwEncoding)
|
||||
echo $(UUId)
|
||||
REM echo $(pipelinePassword)
|
||||
displayName: "Echo Check"
|
||||
# - script: |
|
||||
# echo $(Build.BuildId)
|
||||
# echo $(Build.Reason)
|
||||
# echo $(Build.Repository.Id)
|
||||
# echo $(Build.Repository.Name)
|
||||
# echo $(Build.SourceVersion)
|
||||
# echo $(Configuration)
|
||||
# echo $(CoreVersion)
|
||||
# echo $(GitCommitSeven)
|
||||
# echo $(NugetSource)
|
||||
# echo $(PwEncoding)
|
||||
# echo $(UUId)
|
||||
# REM echo $(pipelinePassword)
|
||||
# displayName: "Echo Check"
|
||||
|
||||
- script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
|
||||
displayName: "Nuget Clear"
|
||||
enabled: false
|
||||
# - script: '"C:\program files\dotnet\dotnet.exe" nuget locals all --clear'
|
||||
# displayName: "Nuget Clear"
|
||||
# enabled: false
|
||||
|
||||
- script: |
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets init
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "GitCommitSeven" "$(GitCommitSeven)"
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets list
|
||||
workingDirectory: Server
|
||||
displayName: "Safe storage of app secrets - Server"
|
||||
# - script: |
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets init
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "BuildNumber" "$(Build.BuildId)"
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "GitCommitSeven" "$(GitCommitSeven)"
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets list
|
||||
# workingDirectory: Server
|
||||
# displayName: "Safe storage of app secrets - Server"
|
||||
|
||||
- script: |
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "IsDevelopment" true
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "MockRoot" "/Data/Tests"
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "URLs" "http://localhost:5002;"
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "MonAResource" "OI_Metrology_Viewer_IFX"
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "ApiExportPath" "\\messdv002.na.infineon.com\Candela\Archive\API"
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "ConnectionString" "Data Source=MESSAD1001\TEST1,59583;Integrated Security=True;Initial Catalog=Metrology;"
|
||||
"C:\program files\dotnet\dotnet.exe" user-secrets set "Oi2SqlConnectionString" "Data Source=MESSAD1001\TEST1,59583;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"
|
||||
workingDirectory: Server
|
||||
displayName: "Safe storage of app secrets II - Server"
|
||||
# - script: |
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "IsDevelopment" true
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "MockRoot" "/Data/Tests"
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "URLs" "http://localhost:5002;"
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "MonAResource" "OI_Metrology_Viewer_IFX"
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "ApiExportPath" "\\messdv002.na.infineon.com\Candela\Archive\API"
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "ConnectionString" "Data Source=MESSAD1001\TEST1,59583;Integrated Security=True;Initial Catalog=Metrology;"
|
||||
# "C:\program files\dotnet\dotnet.exe" user-secrets set "Oi2SqlConnectionString" "Data Source=MESSAD1001\TEST1,59583;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;"
|
||||
# workingDirectory: Server
|
||||
# displayName: "Safe storage of app secrets II - Server"
|
||||
|
||||
- script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
|
||||
workingDirectory: Tests
|
||||
displayName: "Core Build - Tests"
|
||||
# - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
|
||||
# workingDirectory: Tests
|
||||
# displayName: "Core Build - Tests"
|
||||
|
||||
- script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
|
||||
workingDirectory: Server
|
||||
displayName: "Core Build - Server"
|
||||
# - script: '"C:\program files\dotnet\dotnet.exe" build --configuration $(Configuration) --source $(NugetSource)'
|
||||
# workingDirectory: Server
|
||||
# displayName: "Core Build - Server"
|
||||
|
||||
- powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
|
||||
workingDirectory: "$(System.DefaultWorkingDirectory)/.vscode"
|
||||
displayName: "PowerShell Script"
|
||||
# - powershell: Get-ChildItem .\ -include TestResults -Recurse | foreach ($_) { remove-item $_.fullname -Force -Recurse }
|
||||
# workingDirectory: "$(System.DefaultWorkingDirectory)/.vscode"
|
||||
# displayName: "PowerShell Script"
|
||||
|
||||
- script: "dotnet test --configuration $(Configuration)"
|
||||
workingDirectory: Tests
|
||||
displayName: "Core Test"
|
||||
enabled: false
|
||||
# - script: "dotnet test --configuration $(Configuration)"
|
||||
# workingDirectory: Tests
|
||||
# displayName: "Core Test"
|
||||
# enabled: false
|
||||
|
||||
- script: '"C:\program files\dotnet\dotnet.exe" tool restore'
|
||||
workingDirectory: Server
|
||||
displayName: "Tool Restore"
|
||||
enabled: false
|
||||
# - script: '"C:\program files\dotnet\dotnet.exe" tool restore'
|
||||
# workingDirectory: Server
|
||||
# displayName: "Tool Restore"
|
||||
# enabled: false
|
||||
|
||||
- script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:.vscode/TestResults/*/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
|
||||
workingDirectory: Server
|
||||
displayName: "Report Generator"
|
||||
enabled: false
|
||||
# - script: '"C:\program files\dotnet\dotnet.exe" ReportGenerator -reports:.vscode/TestResults/*/coverage.cobertura.xml -targetDir:$(Build.ArtifactStagingDirectory)\Coverage -reportTypes:Html_Dark'
|
||||
# workingDirectory: Server
|
||||
# displayName: "Report Generator"
|
||||
# enabled: false
|
||||
|
||||
- task: PublishTestResults@2
|
||||
displayName: "Publish Test Results **/*.trx"
|
||||
inputs:
|
||||
testResultsFormat: VSTest
|
||||
testResultsFiles: "**/*.trx"
|
||||
testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
|
||||
searchFolder: "$(System.DefaultWorkingDirectory)/.vscode"
|
||||
# - task: PublishTestResults@2
|
||||
# displayName: "Publish Test Results **/*.trx"
|
||||
# inputs:
|
||||
# testResultsFormat: VSTest
|
||||
# testResultsFiles: "**/*.trx"
|
||||
# testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
|
||||
# searchFolder: "$(System.DefaultWorkingDirectory)/.vscode"
|
||||
|
||||
- task: PublishTestResults@2
|
||||
displayName: "Publish Test Results **/coverage.cobertura.xml"
|
||||
inputs:
|
||||
testResultsFormat: VSTest
|
||||
testResultsFiles: "**/coverage.cobertura.xml"
|
||||
testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
|
||||
searchFolder: "$(System.DefaultWorkingDirectory)/.vscode"
|
||||
# - task: PublishTestResults@2
|
||||
# displayName: "Publish Test Results **/coverage.cobertura.xml"
|
||||
# inputs:
|
||||
# testResultsFormat: VSTest
|
||||
# testResultsFiles: "**/coverage.cobertura.xml"
|
||||
# testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
|
||||
# searchFolder: "$(System.DefaultWorkingDirectory)/.vscode"
|
||||
|
||||
- task: PublishCodeCoverageResults@1
|
||||
inputs:
|
||||
codeCoverageTool: "Cobertura"
|
||||
summaryFileLocation: "$(System.DefaultWorkingDirectory)/.vscode/TestResults/*/coverage.cobertura.xml"
|
||||
enabled: false
|
||||
# - task: PublishCodeCoverageResults@1
|
||||
# inputs:
|
||||
# codeCoverageTool: "Cobertura"
|
||||
# summaryFileLocation: "$(System.DefaultWorkingDirectory)/.vscode/TestResults/*/coverage.cobertura.xml"
|
||||
# enabled: false
|
||||
|
||||
- task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1
|
||||
displayName: "Create work item"
|
||||
inputs:
|
||||
teamProject: "Mesa_FI"
|
||||
workItemType: Bug
|
||||
title: $(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)
|
||||
assignedTo: "$(Build.RequestedForId)"
|
||||
enabled: false
|
||||
# - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1
|
||||
# displayName: "Create work item"
|
||||
# inputs:
|
||||
# teamProject: "Mesa_FI"
|
||||
# workItemType: Bug
|
||||
# title: $(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)
|
||||
# assignedTo: "$(Build.RequestedForId)"
|
||||
# enabled: false
|
||||
|
||||
- script: '"C:\program files\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o "D:\$(CoreVersion)\$(Build.Repository.Name)\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)\Server" --source $(NugetSource)'
|
||||
workingDirectory: Server
|
||||
displayName: "Core Publish"
|
||||
# - script: '"C:\program files\dotnet\dotnet.exe" publish --configuration $(Configuration) --runtime win-x64 --self-contained -o "D:\$(CoreVersion)\$(Build.Repository.Name)\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)\Server" --source $(NugetSource)'
|
||||
# workingDirectory: Server
|
||||
# displayName: "Core Publish"
|
||||
|
||||
- task: DownloadSecureFile@1
|
||||
name: downloadSecureFileKDBX
|
||||
displayName: "Download secure file"
|
||||
inputs:
|
||||
secureFile: "Infineon-NA.kdbx"
|
||||
# - task: DownloadSecureFile@1
|
||||
# name: downloadSecureFileKDBX
|
||||
# displayName: "Download secure file"
|
||||
# inputs:
|
||||
# secureFile: "Infineon-NA.kdbx"
|
||||
|
||||
- script: echo "<$(downloadSecureFileKDBX.secureFilePath)>"
|
||||
displayName: "Echo Path"
|
||||
# - script: echo "<$(downloadSecureFileKDBX.secureFilePath)>"
|
||||
# displayName: "Echo Path"
|
||||
|
||||
- script: '"C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)'
|
||||
workingDirectory: Tests
|
||||
displayName: "Core Clean - Tests"
|
||||
enabled: false
|
||||
# - script: '"C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)'
|
||||
# workingDirectory: Tests
|
||||
# displayName: "Core Clean - Tests"
|
||||
# enabled: false
|
||||
|
||||
- script: '"C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)'
|
||||
workingDirectory: Server
|
||||
displayName: "Core Clean - Server"
|
||||
# - script: '"C:\program files\dotnet\dotnet.exe" clean --configuration $(Configuration)'
|
||||
# workingDirectory: Server
|
||||
# displayName: "Core Clean - Server"
|
||||
|
||||
- powershell: |
|
||||
$data = @('$(downloadSecureFileKDBX.secureFilePath)', '-c:GetEntryString', '-Field:Password', '-refx-UUID:$(UUId)', '-pw-enc:$(PwEncoding)')
|
||||
$data.count
|
||||
$processStartInfo = New-Object System.Diagnostics.ProcessStartInfo
|
||||
$processStartInfo.FileName = "C:\Users\$(USERNAME)\AppData\Local\IFXApps\KeePass-2.51.1---KPScript-2.51.1\KPScript.exe"
|
||||
$processStartInfo.RedirectStandardError = $true
|
||||
$processStartInfo.RedirectStandardOutput = $true
|
||||
$processStartInfo.UseShellExecute = $false
|
||||
$processStartInfo.Arguments = $data
|
||||
$process = New-Object System.Diagnostics.Process
|
||||
$process.StartInfo = $processStartInfo
|
||||
$process.Start() | Out-Null
|
||||
$process.WaitForExit()
|
||||
$stdout = $process.StandardOutput.ReadToEnd()
|
||||
$stderr = $process.StandardError.ReadToEnd()
|
||||
Write-Host "stderr: $stderr"
|
||||
Write-Host "exit code: " + $process.ExitCode
|
||||
Write-Host "##vso[task.setvariable variable=pipelinePassword;]$stdout"
|
||||
displayName: pipelinePassword
|
||||
# - powershell: |
|
||||
# $data = @('$(downloadSecureFileKDBX.secureFilePath)', '-c:GetEntryString', '-Field:Password', '-refx-UUID:$(UUId)', '-pw-enc:$(PwEncoding)')
|
||||
# $data.count
|
||||
# $processStartInfo = New-Object System.Diagnostics.ProcessStartInfo
|
||||
# $processStartInfo.FileName = "C:\Users\$(USERNAME)\AppData\Local\IFXApps\KeePass-2.51.1---KPScript-2.51.1\KPScript.exe"
|
||||
# $processStartInfo.RedirectStandardError = $true
|
||||
# $processStartInfo.RedirectStandardOutput = $true
|
||||
# $processStartInfo.UseShellExecute = $false
|
||||
# $processStartInfo.Arguments = $data
|
||||
# $process = New-Object System.Diagnostics.Process
|
||||
# $process.StartInfo = $processStartInfo
|
||||
# $process.Start() | Out-Null
|
||||
# $process.WaitForExit()
|
||||
# $stdout = $process.StandardOutput.ReadToEnd()
|
||||
# $stderr = $process.StandardError.ReadToEnd()
|
||||
# Write-Host "stderr: $stderr"
|
||||
# Write-Host "exit code: " + $process.ExitCode
|
||||
# Write-Host "##vso[task.setvariable variable=pipelinePassword;]$stdout"
|
||||
# displayName: pipelinePassword
|
||||
|
||||
- script: 'sc create "$(ExeName)" start= delayed-auto DisplayName= "$(Build.Repository.Name)-$(Configuration)-$(GitCommitSeven)-$(Build.BuildId)" binPath= D:\$(CoreVersion)\$(Build.Repository.Name)\Server\$(ExeName).exe obj= INFINEON\$(USERNAME) password="$(pipelinePassword)"'
|
||||
workingDirectory: Server
|
||||
displayName: "Service Control - Create"
|
||||
continueOnError: true
|
||||
# - script: 'sc create "$(ExeName)" start= delayed-auto DisplayName= "$(Build.Repository.Name)-$(Configuration)-$(GitCommitSeven)-$(Build.BuildId)" binPath= D:\$(CoreVersion)\$(Build.Repository.Name)\Server\$(ExeName).exe obj= INFINEON\$(USERNAME) password="$(pipelinePassword)"'
|
||||
# workingDirectory: Server
|
||||
# displayName: "Service Control - Create"
|
||||
# continueOnError: true
|
||||
|
||||
- script: 'sc config "$(ExeName)" DisplayName= "$(Build.Repository.Name)-$(Configuration)-$(GitCommitSeven)-$(Build.BuildId)"'
|
||||
displayName: "Service Control - Configure"
|
||||
# - script: 'sc config "$(ExeName)" DisplayName= "$(Build.Repository.Name)-$(Configuration)-$(GitCommitSeven)-$(Build.BuildId)"'
|
||||
# displayName: "Service Control - Configure"
|
||||
|
||||
- script: 'sc stop "$(ExeName)"'
|
||||
displayName: "Service Control - Stop"
|
||||
continueOnError: true
|
||||
# - script: 'sc stop "$(ExeName)"'
|
||||
# displayName: "Service Control - Stop"
|
||||
# continueOnError: true
|
||||
|
||||
- script: 'rmdir "D:\$(CoreVersion)\$(Build.Repository.Name)\Server"'
|
||||
displayName: "Remove directory"
|
||||
continueOnError: true
|
||||
# - script: 'rmdir "D:\$(CoreVersion)\$(Build.Repository.Name)\Server"'
|
||||
# displayName: "Remove directory"
|
||||
# continueOnError: true
|
||||
|
||||
- script: 'mklink /J "D:\$(CoreVersion)\$(Build.Repository.Name)\Server" "D:\$(CoreVersion)\$(Build.Repository.Name)\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)\Server"'
|
||||
displayName: "Link directory"
|
||||
continueOnError: true
|
||||
# - script: 'mklink /J "D:\$(CoreVersion)\$(Build.Repository.Name)\Server" "D:\$(CoreVersion)\$(Build.Repository.Name)\$(GitCommitSeven)-$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)\Server"'
|
||||
# displayName: "Link directory"
|
||||
# continueOnError: true
|
||||
|
||||
- script: 'sc start "$(ExeName)"'
|
||||
displayName: "Service Control - Start"
|
||||
# - script: 'sc start "$(ExeName)"'
|
||||
# displayName: "Service Control - Start"
|
||||
|
||||
- task: PublishBuildArtifacts@1
|
||||
displayName: "Publish Artifact: drop"
|
||||
enabled: false
|
||||
# - task: PublishBuildArtifacts@1
|
||||
# displayName: "Publish Artifact: drop"
|
||||
# enabled: false
|
||||
|
||||
- script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
|
||||
displayName: "Force Fail"
|
||||
enabled: false
|
||||
# - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
|
||||
# displayName: "Force Fail"
|
||||
# enabled: false
|
||||
|
||||
- stage: EC
|
||||
|
||||
pool:
|
||||
name: Mesa-IIS
|
||||
name: open-insight-metrology-viewer
|
||||
demands: OI-Metrology-Server-EC
|
||||
|
||||
jobs:
|
||||
@ -273,7 +273,7 @@ stages:
|
||||
displayName: Configuration
|
||||
|
||||
- script: |
|
||||
set nugetSource=https://messa08ec.ec.local/v3/index.json
|
||||
set nugetSource=https://eaf-prod.mes.infineon.com/v3/index.json
|
||||
echo %nugetSource%
|
||||
echo ##vso[task.setvariable variable=NugetSource;]%nugetSource%
|
||||
echo $(NugetSource)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user