Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
7 changes: 1 addition & 6 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ on:
branches:
- develop

env:
MAJOR: 12
MINOR: 2
RUN: ${{ github.run_number }}

permissions:
contents: read
packages: read
Expand All @@ -33,7 +28,7 @@ jobs:
dotnet restore

- name: Build
run: dotnet build InstallationValidator.sln /p:Version=12.2.9999
run: dotnet build InstallationValidator.sln /p:Version=12.3.9999

- name: Test
run: dotnet test .\tests\**\bin\Debug\net472\InstallationValidator*Tests.dll --filter “TestCategory!=Reporting” --no-build -v normal --logger:"html;LogFileName=../testLog_Windows.html"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Build Nightly 12.2
run-name: Version 12.2.${{ github.run_number }}
name: Build Nightly 12.3
run-name: Version 12.3.${{ github.run_number }}

on:
workflow_dispatch:
Expand All @@ -8,7 +8,7 @@ on:

env:
MAJOR: 12
MINOR: 2
MINOR: 3
RUN: ${{ github.run_number }}
TARGET_FRAMEWORK: net8
Comment thread
rwmcintosh marked this conversation as resolved.
Outdated

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
nuget restore

- name: Build
run: dotnet build InstallationValidator.sln /p:Version=12.2.9999
run: dotnet build InstallationValidator.sln /p:Version=12.3.9999


- name: Cover and report
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-badge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ name: Badge for Nightly Build
on:
workflow_run:
workflows:
- "Build Nightly 12.2"
- "Build Nightly 12.3"
Comment thread
rwmcintosh marked this conversation as resolved.
types:
- completed

Expand Down
12 changes: 9 additions & 3 deletions InstallationValidator.sln
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.12.35527.113 d17.12
# Visual Studio Version 18
VisualStudioVersion = 18.1.11312.151
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstallationValidator", "src\InstallationValidator\InstallationValidator.csproj", "{5CFD54EC-23C4-49DA-8E97-0215F9076F3D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstallationValidator.Tests", "tests\InstallationValidator.Tests\InstallationValidator.Tests.csproj", "{AD493FBC-936F-44A1-AE88-D103EA2DF5B8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1EE126C4-E171-479C-B79A-0B5B1BBC50FC}"
ProjectSection(SolutionItems) = preProject
.github\workflows\build-nightly_12.3.yml = .github\workflows\build-nightly_12.3.yml
.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
.github\workflows\build-nightly.yml = .github\workflows\build-nightly.yml
.github\workflows\codeql.yml = .github\workflows\codeql.yml
.github\workflows\coverage.yml = .github\workflows\coverage.yml
.github\workflows\nightly-badge.yml = .github\workflows\nightly-badge.yml
rakefile.rb = rakefile.rb
README.md = README.md
setup\setup.wxs = setup\setup.wxs
Expand Down Expand Up @@ -47,4 +50,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FFE70107-27E6-4BA4-A910-B3A1DAA1B94B}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion rakefile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
src_dir = src_dir_for("Debug")

all_users_dir = ENV['ALLUSERSPROFILE']
all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '12.2')
all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '12.3')

copy_dependencies solution_dir, all_users_application_dir do
copy_dimensions_xml
Expand Down
16 changes: 8 additions & 8 deletions src/InstallationValidator.Core/InstallationValidator.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<OutputPath>bin\$(Configuration)</OutputPath>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591</NoWarn>
<Version Condition="'$(Version)' == ''">12.2.0</Version>
<Version Condition="'$(Version)' == ''">12.3.0</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
</PropertyGroup>

Expand All @@ -24,15 +24,15 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.2.26" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.2.26" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.2.26" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="12.2.26" />
<PackageReference Include="OSPSuite.Presentation" Version="12.2.26" />
<PackageReference Include="OSPSuite.Assets.Images" Version="12.3.1" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.3.1" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.3.1" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="12.3.1" />
<PackageReference Include="OSPSuite.Presentation" Version="12.3.1" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.1.1" />
<PackageReference Include="OSPSuite.Utility" Version="4.1.1.1" />
<PackageReference Include="OSPSuite.Core" Version="12.2.26" />
<PackageReference Include="OSPSuite.Assets" Version="12.2.26" />
<PackageReference Include="OSPSuite.Core" Version="12.3.1" />
<PackageReference Include="OSPSuite.Assets" Version="12.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/InstallationValidator/InstallationValidator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591, 3246</NoWarn>
<Version Condition="'$(Version)' == ''">12.2.0</Version>
<Version Condition="'$(Version)' == ''">12.3.0</Version>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<ApplicationIcon>InstallationValidator.ico</ApplicationIcon>
</PropertyGroup>
Expand Down Expand Up @@ -49,13 +49,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Core" Version="12.2.26" />
<PackageReference Include="OSPSuite.Core" Version="12.3.1" />
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.15" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.73" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.75" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.19" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.1.1" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.UI" Version="12.2.26" />
<PackageReference Include="OSPSuite.UI" Version="12.3.1" />
<PackageReference Include="OSPSuite.DataBinding" Version="3.0.1.1" />
<PackageReference Include="OSPSuite.DataBinding.Devexpress" Version="6.0.1.2" />

Expand Down
6 changes: 3 additions & 3 deletions src/SimulationOutputComparer/SimulationOutputComparer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591, 3246</NoWarn>
<Version Condition="'$(Version)' == ''">12.2.0</Version>
<Version Condition="'$(Version)' == ''">12.3.0</Version>
<ApplicationIcon>InstallationValidator.ico</ApplicationIcon>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
</PropertyGroup>
Expand Down Expand Up @@ -49,13 +49,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Core" Version="12.2.26" />
<PackageReference Include="OSPSuite.Core" Version="12.3.1" />
<PackageReference Include="OSPSuite.DevExpress" Version="21.2.15" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.73" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.75" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.19" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.1.1" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.UI" Version="12.2.26" />
<PackageReference Include="OSPSuite.UI" Version="12.3.1" />

<PackageReference Include="OSPSuite.DataBinding" Version="3.0.1.1" />
<PackageReference Include="OSPSuite.DataBinding.Devexpress" Version="6.0.1.2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<IsPackable>false</IsPackable>

<RootNamespace>InstallationValidator</RootNamespace>
<Version Condition="'$(Version)' == ''">12.2.0</Version>
<Version Condition="'$(Version)' == ''">12.3.0</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand Down Expand Up @@ -37,10 +37,10 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="nunit" Version="3.14.0" />
<PackageReference Include="OSPSuite.BDDHelper" Version="4.0.1.1" />
<PackageReference Include="OSPSuite.Core" Version="12.2.26" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.2.26" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.2.26" />
<PackageReference Include="OSPSuite.UI" Version="12.2.26" />
<PackageReference Include="OSPSuite.Core" Version="12.3.1" />
<PackageReference Include="OSPSuite.Infrastructure" Version="12.3.1" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.3.1" />
<PackageReference Include="OSPSuite.UI" Version="12.3.1" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.73" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.75" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.19" GeneratePathProperty="true" />
Expand Down