Skip to content

Commit

Permalink
Change net461 to net462 in more places that need it
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmunn
rmunn committed Nov 15, 2024
1 parent 7b61f26 commit 18e435f
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ See full changelog at https://github.com/sillsdev/chorus/blob/master/CHANGELOG.m
has platform dependent binaries, so msbuild decides that Chorus is platform specific,
regardless of the actual platform target. For the same reason we have to set
RuntimeIdentifiers when building with .NET 5 on AppVeyor. Otherwise the build
fails with an error that there is no target for'net461/win7-x86'. -->
fails with an error that there is no target for'net462/win7-x86'. -->
<PlatformTarget>AnyCPU</PlatformTarget>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion l10n/l10n.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
Lines=" &lt;note xml:lang=&quot;en&quot;&gt;Not found in static scan of compiled code (version 0.0.0)&lt;/note&gt;"/>
<!-- Build and extract strings -->
<Exec Command="dotnet build -c Release" WorkingDirectory=".."/>
<Exec Command="&quot;$(PkgL10NSharp_ExtractXliff)\tools\ExtractXliff.exe&quot; -n SIL -o Chorus.dll -b Chorus.en.xlf -x Chorus.en.xlf -p $(GitVersion_NuGetVersion) -m SIL.Localizer.GetString -m SIL.Localizer.Localize -g ../Output/Release/net461/SIL.*.dll" />
<Exec Command="&quot;$(PkgL10NSharp_ExtractXliff)\tools\ExtractXliff.exe&quot; -n SIL -o Chorus.dll -b Chorus.en.xlf -x Chorus.en.xlf -p $(GitVersion_NuGetVersion) -m SIL.Localizer.GetString -m SIL.Localizer.Localize -g ../Output/Release/net462/SIL.*.dll" />
</Target>

<Target Name="PackageL10ns" DependsOnTargets="restore;GetVersion">
Expand Down
2 changes: 1 addition & 1 deletion src/Chorus/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<section name="Chorus.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup><userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup><userSettings>
<Chorus.Properties.Settings>
<setting name="PathToRepository" serializeAs="String">
<value/>
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusHub/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
2 changes: 1 addition & 1 deletion src/ChorusHubApp/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<configuration>
<configSections>
</configSections>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
30 changes: 15 additions & 15 deletions src/Installer/ChorusHub.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
<!-- -->
<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A newer version of Chorus Hub is already installed. Setup will now exit." Schedule="afterInstallValidate"/>

<PropertyRef Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED"/>
<Condition Message="Before [ProductName] can install, you need to install Microsoft's free .NET Framework 4.6.1 or later.">
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED]]>
<PropertyRef Id="WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED"/>
<Condition Message="Before [ProductName] can install, you need to install Microsoft's free .NET Framework 4.6.2 or later.">
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_462_OR_LATER_INSTALLED]]>
</Condition>

<!--because of bug, this needs to be 1 (now set with "'InstallScope="perMachine"' in Package element, above.
Expand Down Expand Up @@ -55,7 +55,7 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->

<!-- Main assemblies -->
<Component Id="ChorusHub.exe" Guid="C1EEF458-E382-11DE-8A39-0800200C9A66">
<File Id="ChorusHub.exe" Name="ChorusHub.exe" Source="..\..\output\Release\net461\ChorusHub.exe" KeyPath="yes" />
<File Id="ChorusHub.exe" Name="ChorusHub.exe" Source="..\..\output\Release\net462\ChorusHub.exe" KeyPath="yes" />
<!-- http://codeblog.vurdalakov.net/2013/06/wix-how-to-install-and-start-windows-service.html -->
<ServiceInstall Id="ChorusHub" Type="ownProcess" Name="ChorusHub" DisplayName="Chorus Hub Sharing Service"
Description="ChorusHub Sharing Service" Start="auto" Account="LocalSystem" ErrorControl="normal">
Expand All @@ -73,46 +73,46 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
</RegistryKey>
</Component>
<Component Id="LibChorus.dll" Guid="C1EECD54-E382-11DE-8A39-0800200C9A66">
<File Id="LibChorus.dll" Name="LibChorus.dll" KeyPath="yes" Source="..\..\output\Release\net461\LibChorus.dll" />
<File Id="LibChorus.dll" Name="LibChorus.dll" KeyPath="yes" Source="..\..\output\Release\net462\LibChorus.dll" />
</Component>

<!-- used by chorus -->
<Component Id="Autofac.dll" Guid="C1EECD55-E382-11DE-8A39-0800200C9A66">
<File Id="Autofac.dll" Name="Autofac.dll" KeyPath="yes" Source="..\..\output\Release\net461\Autofac.dll" />
<File Id="Autofac.dll" Name="Autofac.dll" KeyPath="yes" Source="..\..\output\Release\net462\Autofac.dll" />
</Component>
<Component Id="chorushelp.chm" Guid="C1EECD56-E382-11DE-8A39-0800200C9A66">
<File Id="chorushelp.chm" Name="Chorus_Help.chm" KeyPath="yes" Source="..\..\DistFiles\Help\Chorus_Help.chm"/>
</Component>
<!-- used by chorus help -->
<Component Id="Vulcan.Uczniowie.HelpProvider.dll" Guid="C1EEF450-E382-11DE-8A39-0800200C9A66">
<File Id="Vulcan.Uczniowie.HelpProvider.dll" Name="Vulcan.Uczniowie.HelpProvider.dll" KeyPath="yes" Source="..\..\output\Release\net461\Vulcan.Uczniowie.HelpProvider.dll" />
<File Id="Vulcan.Uczniowie.HelpProvider.dll" Name="Vulcan.Uczniowie.HelpProvider.dll" KeyPath="yes" Source="..\..\output\Release\net462\Vulcan.Uczniowie.HelpProvider.dll" />
</Component>

<Component Id="SIL.Core.dll" Guid="C1EEF451-E382-11DE-8A39-0800200C9A66">
<File Id="SIL.Core.dll" Name="SIL.Core.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Core.dll" />
<File Id="SIL.Core.dll" Name="SIL.Core.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Core.dll" />
</Component>

<Component Id="SIL.Core.Desktop.dll" Guid="923331FA-197B-4844-930C-21FFDBC480BE">
<File Id="SIL.Core.Desktop.dll" Name="SIL.Core.Desktop.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Core.Desktop.dll" />
<File Id="SIL.Core.Desktop.dll" Name="SIL.Core.Desktop.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Core.Desktop.dll" />
</Component>

<!-- ICU assemblies used by chorus/palaso -->
<Component Id="icu.net.dll" Guid="C1EEF452-E382-11DE-8A39-0800200C9A66">
<File Id="icu.net.dll" Name="icu.net.dll" KeyPath="yes" Source="..\..\output\Release\net461\icu.net.dll" />
<File Id="icu.net.dll" Name="icu.net.dll" KeyPath="yes" Source="..\..\output\Release\net462\icu.net.dll" />
</Component>
<Component Id="icudt59.dll" Guid="C1EEF453-E382-11DE-8A39-0800200C9A66">
<File Id="icudt59.dll" Name="icudt59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icudt59.dll" />
<File Id="icudt59.dll" Name="icudt59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icudt59.dll" />
</Component>
<Component Id="icuin59.dll" Guid="C1EEF454-E382-11DE-8A39-0800200C9A66">
<File Id="icuin59.dll" Name="icuin59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icuin59.dll" />
<File Id="icuin59.dll" Name="icuin59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icuin59.dll" />
</Component>
<Component Id="icuuc59.dll" Guid="C1EEF455-E382-11DE-8A39-0800200C9A66">
<File Id="icuuc59.dll" Name="icuuc59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icuuc59.dll" />
<File Id="icuuc59.dll" Name="icuuc59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icuuc59.dll" />
</Component>

<!-- L10NSharp assembly used by chorus/palaso -->
<Component Id="L10NSharp.dll" Guid="C1EEF456-E382-11DE-8A39-0800200C9A66">
<File Id="L10NSharp.dll" Name="L10NSharp.dll" KeyPath="yes" Source="..\..\output\Release\net461\L10NSharp.dll"/>
<File Id="L10NSharp.dll" Name="L10NSharp.dll" KeyPath="yes" Source="..\..\output\Release\net462\L10NSharp.dll"/>
</Component>
</Directory>
</Directory>
Expand Down Expand Up @@ -149,7 +149,7 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
<MergeRef Id="CRT90Policy"/>
</Feature>

<Icon Id="chorusHubIcon.ico" SourceFile="..\..\output\Release\net461\ChorusHub.exe"/>
<Icon Id="chorusHubIcon.ico" SourceFile="..\..\output\Release\net462\ChorusHub.exe"/>
<!-- what you see in add/remove programs control panel -->
<Property Id="ARPPRODUCTICON" Value="chorusHubIcon.ico"/>
</Product>
Expand Down
24 changes: 12 additions & 12 deletions src/Installer/ChorusMergeModule.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,48 +45,48 @@ http://blogs.msdn.com/robmen/archive/2003/10/04/56479.aspx -->
</Directory>

<Component Id="libchorus.dll" Guid="B9BCFD29-E687-4ec1-9407-1918AD14075B">
<File Id="libchorus.dll" Name="libchorus.dll" KeyPath="yes" Source="..\..\output\Release\net461\libchorus.dll" />
<File Id="libchorus.dll" Name="libchorus.dll" KeyPath="yes" Source="..\..\output\Release\net462\libchorus.dll" />
</Component>
<Component Id="chorus.exe" Guid="BAF93900-B12B-4942-BA85-55090CF005D8">
<File Id="chorus.exe" Name="chorus.exe" KeyPath="yes" Source="..\..\output\Release\net461\chorus.exe" />
<File Id="chorus.exe" Name="chorus.exe" KeyPath="yes" Source="..\..\output\Release\net462\chorus.exe" />
</Component>
<Component Id="chorusmerge.exe" Guid="7A088F3F-411D-41f9-BBA3-4304E2865969">
<File Id="chorusmerge.exe" Name="chorusmerge.exe" KeyPath="yes" Source="..\..\output\Release\net461\chorusmerge.exe" />
<File Id="chorusmerge.exe" Name="chorusmerge.exe" KeyPath="yes" Source="..\..\output\Release\net462\chorusmerge.exe" />
</Component>
<Component Id="chorushelp.chm" Guid="C1EDBBE9-E382-11DE-8A39-0800200C9A66">
<File Id="chorushelp.chm" Name="Chorus_Help.chm" KeyPath="yes" Source="..\..\DistFiles\Help\Chorus_Help.chm"/>
</Component>

<!-- used by chorus help -->
<Component Id="Vulcan.Uczniowie.HelpProvider.dll" Guid="{F8BCCD28-AB69-4C3D-B024-6B109ADC75B0}">
<File Id="Vulcan.Uczniowie.HelpProvider.dll" Name="Vulcan.Uczniowie.HelpProvider.dll" KeyPath="yes" Source="..\..\output\Release\net461\Vulcan.Uczniowie.HelpProvider.dll" />
<File Id="Vulcan.Uczniowie.HelpProvider.dll" Name="Vulcan.Uczniowie.HelpProvider.dll" KeyPath="yes" Source="..\..\output\Release\net462\Vulcan.Uczniowie.HelpProvider.dll" />
</Component>

<!-- used by chorus -->
<Component Id="Autofac.dll" Guid="C1EE09F6-E382-11DE-8A39-0800200C9A66">
<File Id="Autofac.dll" Name="Autofac.dll" KeyPath="yes" Source="..\..\output\Release\net461\Autofac.dll" />
<File Id="Autofac.dll" Name="Autofac.dll" KeyPath="yes" Source="..\..\output\Release\net462\Autofac.dll" />
</Component>
<!-- Palaso assemblies used by chorus -->
<Component Id="icu.net.dll" Guid="C1EE09F7-E382-11DE-8A39-0800200C9A66">
<File Id="icu.net.dll" Name="icu.net.dll" KeyPath="yes" Source="..\..\output\Release\net461\icu.net.dll" />
<File Id="icu.net.dll" Name="icu.net.dll" KeyPath="yes" Source="..\..\output\Release\net462\icu.net.dll" />
</Component>
<Component Id="icudt59.dll" Guid="C1EE3118-E382-11DE-8A39-0800200C9A66">
<File Id="icudt59.dll" Name="icudt59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icudt59.dll" />
<File Id="icudt59.dll" Name="icudt59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icudt59.dll" />
</Component>
<Component Id="icuin59.dll" Guid="C1EE3117-E382-11DE-8A39-0800200C9A66">
<File Id="icuin59.dll" Name="icuin59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icuin59.dll" />
<File Id="icuin59.dll" Name="icuin59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icuin59.dll" />
</Component>
<Component Id="icuuc59.dll" Guid="C1EE3116-E382-11DE-8A39-0800200C9A66">
<File Id="icuuc59.dll" Name="icuuc59.dll" KeyPath="yes" Source="..\..\output\Release\net461\lib\win-x86\icuuc59.dll" />
<File Id="icuuc59.dll" Name="icuuc59.dll" KeyPath="yes" Source="..\..\output\Release\net462\lib\win-x86\icuuc59.dll" />
</Component>
<Component Id="SIL.Core.dll" Guid="C1EE09F8-E382-11DE-8A39-0800200C9A66">
<File Id="SIL.Core.dll" Name="SIL.Core.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Core.dll" />
<File Id="SIL.Core.dll" Name="SIL.Core.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Core.dll" />
</Component>
<Component Id="SIL.Lift.dll" Guid="C1EE09F9-E382-11DE-8A39-0800200C9A66">
<File Id="SIL.Lift.dll" Name="SIL.Lift.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Lift.dll" />
<File Id="SIL.Lift.dll" Name="SIL.Lift.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Lift.dll" />
</Component>
<Component Id="SIL.Windows.Forms.dll" Guid="c1ee09fa-e382-11de-8a39-0800200c9a66">
<File Id="SIL.Windows.Forms.dll" Name="SIL.Windows.Forms.dll" KeyPath="yes" Source="..\..\output\Release\net461\SIL.Windows.Forms.dll" />
<File Id="SIL.Windows.Forms.dll" Name="SIL.Windows.Forms.dll" KeyPath="yes" Source="..\..\output\Release\net462\SIL.Windows.Forms.dll" />
</Component>
</Directory>
</Directory>
Expand Down
4 changes: 2 additions & 2 deletions src/LibChorus/Properties/launchSettings.json.sample
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"profiles": {
"FLEx Bridge (Get)": {
"commandName": "Executable",
"executablePath": "C:\\fwrepo\\flexbridge\\output\\Debug\\net461\\FLExBridge.exe",
"executablePath": "C:\\fwrepo\\flexbridge\\output\\Debug\\net462\\FLExBridge.exe",
"commandLineArgs": "-u developer -p c:\\fwrepo\\fw\\DistFiles\\Projects -v obtain -projDir c:\\fwrepo\\fw\\DistFiles\\Projects -fwAppsDir C:\\fwrepo\\fw\\Output\\Debug -fwmodel 7000072 -liftmodel 0.13_ldml3 -locale en -pipeID SendReceivec:\\fwrepo\\fw\\DistFiles\\Projectsobtain"
},
"FLEx Bridge (S&R)": {
"commandName": "Executable",
"executablePath": "C:\\fwrepo\\flexbridge\\output\\Debug\\net461\\FLExBridge.exe",
"executablePath": "C:\\fwrepo\\flexbridge\\output\\Debug\\net462\\FLExBridge.exe",
"commandLineArgs": "-u developer -p c:\\fwrepo\\fw\\DistFiles\\Projects\\Sena 3\\Sena 3.fwdata -v send_receive -f C:\\fwrepo\\fw\\Output\\Debug\\FixFwData.exe -projDir c:\\fwrepo\\fw\\DistFiles\\Projects -fwAppsDir C:\\fwrepo\\fw\\Output\\Debug -fwmodel 7000072 -liftmodel 0.13_ldml3 -locale en -pipeID SendReceivec:\\fwrepo\\fw\\DistFiles\\Projects\\Sena 3\\Sena 3.fwdatasend_receive -ws seh"
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/LibChorus/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
</setting>
</Chorus.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
2 changes: 1 addition & 1 deletion src/LibChorusTests/FileHandlers/ChorusFileTypeHandlerCollectionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private static string SamplePluginPath
var configOutputDir = Directory.GetParent(BaseDir);
var outputDir = configOutputDir.Parent.FullName;
var config = configOutputDir.Name;
var samplePluginDllPath = Path.Combine(outputDir, "SamplePlugin", config, "net461", "Tests-ChorusPlugin.dll");
var samplePluginDllPath = Path.Combine(outputDir, "SamplePlugin", config, "net462", "Tests-ChorusPlugin.dll");
return samplePluginDllPath;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/SampleApp/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

0 comments on commit 18e435f

Please sign in to comment.