Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Crowther committed Jan 25, 2022
2 parents 99f9f34 + 9bbb8b2 commit 07398a5
Show file tree
Hide file tree
Showing 41 changed files with 496 additions and 249 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Build

on:
push:
branches-ignore:
- 'gh-pages'
pull_request:
branches-ignore:
- 'gh-pages'

env:
# set RestoreUseSkipNonexistentTargets=false so running "nuget.exe restore dni.sln" returns a successful exit code (0).
# Otherwise, the following errors occur:
# .\Samples\PackagedSetup\Simple\Simple.vdproj(1,1): error MSB4025: The project file could not be loaded. Data at the root level is invalid. Line 1, position 1. [dni.proj]
# EXEC : warning : Error reading msbuild project information, ensure that your input solution or project file is valid. NETCore and UAP projects will be skipped, only packages.config files will be restored. [dni.proj]
# dni.proj(130,5): error MSB3073: The command "ThirdParty\NuGet\NuGet.exe restore Dni.sln" exited with code -1.
RestoreUseSkipNonexistentTargets: false

jobs:
build:
runs-on: windows-latest

strategy:
matrix:
Configuration: [Debug, Release]

steps:
- uses: actions/checkout@v2

- name: Add MSBuild to PATH
uses: microsoft/[email protected]

- name: Build
working-directory: ${{env.GITHUB_WORKSPACE}}
run: msbuild /t:all /m /p:Configuration=${{ matrix.Configuration }} .\dni.proj

- name: Upload Build Artifacts
uses: actions/[email protected]
with:
name: ${{ matrix.Configuration }}
path: |
.\target\${{ matrix.Configuration }}\dotNetInstaller.*.zip
.\target\${{ matrix.Configuration }}\dotNetInstaller.*.msi
if-no-files-found: error
17 changes: 17 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
3.2.115 (1/15/2022)
===================

Features
--------

* [#146](https://github.com/dotnetinstaller/dotnetinstaller/pull/146) - Added support for specific Windows 10 versions, Windows 11, Windows Server 2019, and Windows Server 2022 - [@icnocop](https://github.com/icnocop).
* [#144](https://github.com/dotnetinstaller/dotnetinstaller/issues/144) - Fix: OSinfo not displaying correctly if server 2016 or 2019 - [@icnocop](https://github.com/icnocop).

3.1.415 (4/15/2021)
===================

Features
--------

* [#141](https://github.com/dotnetinstaller/dotnetinstaller/pull/141) - Added support for `v[version]` format for version numbers (with a leading `v` or `V`); e.g. `v3.1.415` - [@mariusbancila](https://github.com/mariusbancila).

3.0.814 (8/14/2019)
===================

Expand Down
8 changes: 8 additions & 0 deletions Documentation/Content/InstalledChecks.aml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,14 @@
versions, because the patch should not be installed when neither version of the product is installed. In this case
set <newTerm>defaultValue</newTerm> to <newTerm>true</newTerm>.
</para>
<para>
<alert class="note">
<para>
When checking for version, the version string can have the form <literal>major.minor.build.revision</literal>, with <literal>major</literal> being the only field that is required.
Examples include "1", "1.2", "1.2.0", or "1.2.0.100". A leading <literal>v</literal> or <literal>V</literal> is also supported, such as in "v1.2.0" or "V1.2.0.100".
</para>
</alert>
</para>
</content>
</section>
<section address="checktypesproduct">
Expand Down
10 changes: 5 additions & 5 deletions Documentation/Content/Main.aml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@
</listItem>
<listItem>
<application>InstallerEditor</application>: an application for editing configuration files and dotNetInstaller.exe
resources, written in C# for the .NET Framework 2.0. The editor is also capable of importing older
resources, written in C# for the .NET Framework 4.0. The editor is also capable of importing older
versions of dotNetInstaller configuration files and converting them into the current/newer format.
</listItem>
<listItem>
<application>InstallerLinker</application>: a command-line bootstrapper linker that can be used in a build process,
written in C# for the .NET Framework 2.0.
written in C# for the .NET Framework 4.0.
</listItem>
<listItem>
Several samples and dependency templates that can be reused as-is and that demonstrate sometimes complex checks which
Expand All @@ -91,10 +91,10 @@
<linkUri>https://sourceforge.net/projects/dotnetinstaller</linkUri>
<linkText>SourceForge</linkText>
</externalLink> by David Icardi.
It's now fully open-sourced and maintained on CodePlex at
It continued its journey through CodePlex and is now officially maintained on Github at
<externalLink>
<linkUri>http://dotnetinstaller.codeplex.com/</linkUri>
<linkText>http://dotnetinstaller.codeplex.com/</linkText>
<linkUri>https://github.com/dotnetinstaller/dotnetinstaller</linkUri>
<linkText>https://github.com/dotnetinstaller/dotnetinstaller</linkText>
</externalLink> by a community of developers that use dotNetInstaller in their own projects.
</para>
</introduction>
Expand Down
78 changes: 71 additions & 7 deletions Documentation/Content/OsFilters.aml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
If one of the bounds is not specified, the value must be greater or equal than <literal>os_filter_min</literal>
or smaller or equal than <literal>os_filter_max</literal> respectively.
</para>
<para>
You cannot use <literal>os_filter_max</literal>, <literal>os_filter_min</literal>, and <literal>os_filter</literal>.
If <literal>os_filter</literal> is set, then <literal>os_filter_max</literal> and <literal>os_filter_min</literal> must be empty.
</para>
<para>
The following operating system table values can be used for <literal>os_filter</literal>,
<literal>os_filter_min</literal> and <literal>os_filter_max</literal>.
Expand Down Expand Up @@ -143,28 +147,88 @@
<entry>Windows 8</entry>
<entry>win8</entry>
</row>
<row>
<entry>Windows Server 2012</entry>
<entry>win8Server</entry>
</row>
<row>
<entry>Windows 8.1</entry>
<entry>win8_1</entry>
</row>
<row>
<entry>Windows Server 2012</entry>
<entry>win8Server</entry>
</row>
<row>
<entry>Windows Server 2012 R2</entry>
<entry>win8ServerR2</entry>
</row>
<row>
<entry>Windows 10</entry>
<entry>Windows 10</entry>
<entry>win10</entry>
</row>
<row>
<entry>Windows Server 10</entry>
<entry>Windows 10 Version 1511</entry>
<entry>win10_1511</entry>
</row>
<row>
<entry>Windows 10 Version 1607</entry>
<entry>win10_1607</entry>
</row>
<row>
<entry>Windows 10 Version 1703</entry>
<entry>win10_1703</entry>
</row>
<row>
<entry>Windows 10 Version 1709</entry>
<entry>win10_1709</entry>
</row>
<row>
<entry>Windows 10 Version</entry>
<entry>win10_1803</entry>
</row>
<row>
<entry>Windows 10 Version 1809</entry>
<entry>win10_1809</entry>
</row>
<row>
<entry>Windows 10 Version 1903</entry>
<entry>win10_1903</entry>
</row>
<row>
<entry>Windows 10 Version 1909</entry>
<entry>win10_1909</entry>
</row>
<row>
<entry>Windows 10 Version 2004</entry>
<entry>win10_2004</entry>
</row>
<row>
<entry>Windows 10 Version 20H2</entry>
<entry>win10_20H2</entry>
</row>
<row>
<entry>Windows 10 Version 21H1</entry>
<entry>win10_21H1</entry>
</row>
<row>
<entry>Windows 10 Version 21H2</entry>
<entry>win10_21H2</entry>
</row>
<row>
<entry>Windows Server 2016</entry>
<entry>win10Server</entry>
</row>
<row>
<entry>Windows newer than 10</entry>
<entry>Windows Server 2019</entry>
<entry>winServer2019</entry>
</row>
<row>
<entry>Windows Server 2022</entry>
<entry>winServer2022</entry>
</row>
<row>
<entry>Windows 11</entry>
<entry>win11</entry>
</row>
<row>
<entry>Windows newer than 10 or Server 2016</entry>
<entry>winMax</entry>
</row>
</table>
Expand Down
Loading

0 comments on commit 07398a5

Please sign in to comment.