Skip to content

Bump jQuery from 1.10.2 to 3.5.0 in /PART/Source/CprBroker/Web #27

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.

Sign up for GitHub

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

Open
dependabot wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Bump jQuery from 1.10.2 to 3.5.0 in /PART/Source/CprBroker/Web #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ccbdc
Version bump 2.4.9: Allow delete person if pnr is unknown in cpr direct.
heiniovason Sep 30, 2021
e31da82
Bump jQuery from 1.10.2 to 3.5.0 in /PART/Source/CprBroker/Web
dependabot[bot] Sep 10, 2024
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
4 changes: 2 additions & 2 deletions PART/Source/Core/Config/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.4.8.0")]
[assembly: AssemblyFileVersion("2.4.8.0")]
[assembly: AssemblyVersion("2.4.9.0")]
[assembly: AssemblyFileVersion("2.4.9.0")]
4 changes: 2 additions & 2 deletions PART/Source/Core/Utilities/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public sealed class Versioning
public static readonly int Minor = 0;

// TODO: Set version manually in Config project
public const string AssemblyVersion = "2.4.8.0";
public const string AssemblyFileVersion = "2.4.8.0";
public const string AssemblyVersion = "2.4.9.0";
public const string AssemblyFileVersion = "2.4.9.0";
}

public static readonly Guid EventBrokerApplicationId = new Guid("{C98F9BE7-2DDE-404a-BAB5-5A7B1BBC3063}");
Expand Down
8 changes: 7 additions & 1 deletion PART/Source/CprBroker/CPRDirect/CPRDirectClientDataProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,13 @@ public bool RemoveSubscription(PersonIdentifier personIdentifier)
return true;
} else
{
throw new Exception(error);
// throw new Exception(error);

// Throwing an exception will cancel a person removal attempt.
// We do not want this, e.g. if the error occurs solely because CPR Direct does not recognize a given cpr no.
// BUT we do need to log the error in case of other scenarios.
Admin.LogError(error);
return true;
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion PART/Source/CprBroker/Web/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="bootstrap" version="3.0.0" targetFramework="net461" />
<package id="bootstrap.daterangepicker" version="2.1.24.1" targetFramework="net461" />
<package id="bootstrap-select" version="1.12.2" targetFramework="net461" />
<package id="jQuery" version="1.10.2" targetFramework="net461" />
<package id="jQuery" version="3.5.0" targetFramework="net461" />
<package id="log4net" version="2.0.12" targetFramework="net461" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net46" />
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net46" />
Expand Down
6 changes: 3 additions & 3 deletions PART/Source/CprBroker/WixInstaller/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >

<Product Id="632b6f92-1383-4138-8d75-5a153d2c96c4" Name="Cpr Broker" Language="1033" Version="2.4.8.0" Manufacturer="OS2 - Public Digitalization Network" UpgradeCode="FF0F6556-3323-43A8-9AB3-E567BEF13F6A">
<Product Id="2b47317c-0b33-4810-9020-7b7091e2ed4b" Name="Cpr Broker" Language="1033" Version="2.4.9.0" Manufacturer="OS2 - Public Digitalization Network" UpgradeCode="FF0F6556-3323-43A8-9AB3-E567BEF13F6A">

<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/> <!-- InstallScope="perMachine" requires elevated privileges. -->
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
Expand All @@ -27,10 +27,10 @@
-->
<Upgrade Id="FF0F6556-3323-43A8-9AB3-E567BEF13F6A">
<!--Detect old version -->
<UpgradeVersion Maximum="2.4.8.0" IncludeMaximum="no" Property="OLDER_VERSION_DETECTED" OnlyDetect="yes" MigrateFeatures="yes" />
<UpgradeVersion Maximum="2.4.9.0" IncludeMaximum="no" Property="OLDER_VERSION_DETECTED" OnlyDetect="yes" MigrateFeatures="yes" />

<!--Detect newer versions, set a property that triggers a condition failure -->
<UpgradeVersion Minimum="2.4.8.0" IncludeMinimum="no" Property="NEWER_VERSION_DETECTED" OnlyDetect="yes" />
<UpgradeVersion Minimum="2.4.9.0" IncludeMinimum="no" Property="NEWER_VERSION_DETECTED" OnlyDetect="yes" />
</Upgrade>

<!-- Special detection for 2.2.2 buggy upgrade code-->
Expand Down