Skip to content

Upgrade to .Net Framework 4.8 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2022
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
6 changes: 2 additions & 4 deletions .github/workflows/build-validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- '**.vbproj'

env:
DOTNET_VERSION: '4.7.2' # The .NET SDK version to use
DOTNET_VERSION: '4.8' # The .NET SDK version to use
SLN_FILE: WinNUT_V2.sln
DEBUG_OUTPUT: WinNUT_V2/WinNUT-Client/bin/Debug

Expand All @@ -38,9 +38,7 @@ jobs:

# msbuild cannot handle .vdproj Installer projects, so only build debug for now.
- name: Build solution
run: |
Write-Output "::echo::on"
msbuild.exe $env:SLN_FILE -p:Configuration=Debug
run: msbuild $env:SLN_FILE -p:Configuration=Debug

# For now, let msbuild continue autogenerating assembly versions and base everything off of that.
- name: Get AssemblyVersion generated by msbuild
Expand Down
2 changes: 1 addition & 1 deletion WinNUT_V2/AGauge_mod/AGauge.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>System.Windows.Forms</RootNamespace>
<AssemblyName>AGauge</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
28 changes: 14 additions & 14 deletions WinNUT_V2/Setup/Setup.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -4960,37 +4960,37 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_E8BB0E2A241C1023B684B55FEB5B745F"
"OwnerKey" = "8:_5C99D3FB8E4CBB81209F637E049611DF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_929B73992E930343CA5B90A2038D04AB"
"OwnerKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_63C8A279ECA1961108679E2A93D5C62B"
"OwnerKey" = "8:_E8BB0E2A241C1023B684B55FEB5B745F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"OwnerKey" = "8:_929B73992E930343CA5B90A2038D04AB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5C99D3FB8E4CBB81209F637E049611DF"
"OwnerKey" = "8:_63C8A279ECA1961108679E2A93D5C62B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -6285,7 +6285,7 @@
{
"Name" = "8:.NET Framework"
"Message" = "8:[VSDNETMSG]"
"FrameworkVersion" = "8:.NETFramework,Version=v4.7.2"
"FrameworkVersion" = "8:.NETFramework,Version=v4.8"
"AllowLaterVersions" = "11:FALSE"
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=863262"
}
Expand Down Expand Up @@ -8784,7 +8784,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.2.8338.29043, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.2.8338.35532, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_5C99D3FB8E4CBB81209F637E049611DF"
Expand Down Expand Up @@ -9548,7 +9548,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.8338.28799, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.8338.35532, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_7643B2E01E55816C8BA2265FF9E9B786"
Expand Down Expand Up @@ -9853,7 +9853,7 @@
"_7F619FE6A380D79E80E85D6E6822F82A"
{
"Name" = "8:System.ObjectModel.dll"
"Attributes" = "3:514"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.ObjectModel.dll"
Expand All @@ -9864,7 +9864,7 @@
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:TRUE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
Expand Down Expand Up @@ -11082,7 +11082,7 @@
"_B5EB4F25C305A58F1CAA2F30A1C745CA"
{
"Name" = "8:System.ObjectModel.dll"
"Attributes" = "3:514"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.ObjectModel.dll"
Expand All @@ -11093,7 +11093,7 @@
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:TRUE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
Expand Down Expand Up @@ -12896,7 +12896,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WinNUT"
"ProductCode" = "8:{4B9C8FB9-4559-40A2-93F6-A99AE67A60DA}"
"PackageCode" = "8:{7B73F5A1-EB4E-40A7-8162-94A7780C50ED}"
"PackageCode" = "8:{2AB34500-9AC5-48A5-BE38-C9122A50EEF0}"
"UpgradeCode" = "8:{7EA17151-76E7-4E29-8F6A-621C1B4144C2}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
Expand Down
2 changes: 1 addition & 1 deletion WinNUT_V2/WinNUT-Client/App.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
<system.diagnostics>
<sources>
Expand Down
16 changes: 8 additions & 8 deletions WinNUT_V2/WinNUT-Client/My Project/Application.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions WinNUT_V2/WinNUT-Client/My Project/Settings.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<AssemblyName>WinNUT-Client</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>
Expand Down
23 changes: 12 additions & 11 deletions WinNUT_V2/WinNUT-Client_Common/My Project/Resources.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 25 additions & 25 deletions WinNUT_V2/WinNUT-Client_Common/My Project/Settings.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
<AssemblyName>WinNUT-Client_Common</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>Windows</MyType>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<Deterministic>false</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -80,6 +81,7 @@
<Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
Expand Down