Skip to content

Commit bbe5b1a

Browse files
WillStrohlWillStrohl
authored
Merge pull request #71 from UpendoVentures/dev
Syncing dev with main
2 parents 59ff6d3 + 352542b commit bbe5b1a

17 files changed

+721
-205
lines changed

‎Build/HccViewsetPackage.targets

+48
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,54 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
-->
2323
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2424
<Import Project="MSBuild.Community.Tasks.Targets" />
25+
<Import Project="$(BuildScriptsPath)\Helpers.Targets" />
26+
<Target Name="SetVersion" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<XmlRead Prefix="n"
28+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
29+
XPath="dotnetnuke/packages/package[1]/@version"
30+
XmlFileName="$(DNNFileName).dnn">
31+
<Output TaskParameter="Value" PropertyName="Version" />
32+
</XmlRead>
33+
34+
<ToShortVersion Version="$(Version)">
35+
<Output PropertyName="sVersion" TaskParameter="ShortVersion" />
36+
</ToShortVersion>
37+
38+
<!-- AssemblyInfo -->
39+
<ReplaceFileText
40+
Filename="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs"
41+
MatchExpression="AssemblyVersion\(&quot;[0-9|\\.]%2A&quot;\)"
42+
ReplacementText="AssemblyVersion(&quot;$(Version)&quot;)" />
43+
<ReplaceFileText
44+
Filename="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs"
45+
MatchExpression="AssemblyFileVersion\(&quot;[0-9|\\.]%2A&quot;\)"
46+
ReplacementText="AssemblyFileVersion(&quot;$(Version)&quot;)" />
47+
48+
<!-- Manifest -->
49+
<ReplaceXmlAttributeValue
50+
Filename="$(DNNFileName).dnn"
51+
XPathAttributeSelector = "/dotnetnuke/packages/package/@version"
52+
NewValue="$(Version)" />
53+
<ReplaceXmlNodeText
54+
Filename="$(DNNFileName).dnn"
55+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Assembly']/assemblies/assembly/version[../name/text() = '$(AssemblyName).dll']"
56+
NewValue="$(Version)" />
57+
<ReplaceXmlNodeText
58+
Filename="$(DNNFileName).dnn"
59+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Script']/scripts/script[@type='UnInstall']/version"
60+
NewValue="$(Version)" />
61+
62+
<!-- Symbols Manifest -->
63+
<ReplaceXmlAttributeValue
64+
Filename="$(DNNFileName)_Symbols.dnn"
65+
XPathAttributeSelector = "/dotnetnuke/packages/package/@version"
66+
NewValue="$(Version)" />
67+
<ReplaceXmlAttributeValue
68+
Filename="$(DNNFileName)_Symbols.dnn"
69+
XPathAttributeSelector = "/dotnetnuke/packages/package/dependencies/dependency[@type='managedPackage'][text()='$(PackageName)']/@version"
70+
NewValue="$(sVersion)" />
71+
72+
</Target>
2573
<Target Name="PackageModule" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2674
<XmlRead Prefix="n"
2775
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"

‎Build/Helpers.targets

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
3+
<ParameterGroup>
4+
<Filename ParameterType="System.String" Required="true" />
5+
<MatchExpression ParameterType="System.String" Required="true" />
6+
<ReplacementText ParameterType="System.String" Required="true" />
7+
</ParameterGroup>
8+
<Task>
9+
<Reference Include="System.Core" />
10+
<Using Namespace="System" />
11+
<Using Namespace="System.IO" />
12+
<Using Namespace="System.Text.RegularExpressions" />
13+
<Code Type="Fragment" Language="cs">
14+
<![CDATA[
15+
File.WriteAllText(
16+
Filename,
17+
Regex.Replace(File.ReadAllText(Filename), MatchExpression, ReplacementText)
18+
);
19+
]]>
20+
</Code>
21+
</Task>
22+
</UsingTask>
23+
<UsingTask TaskName="ReplaceXmlNodeText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
24+
<ParameterGroup>
25+
<Filename ParameterType="System.String" Required="true" />
26+
<XPathNodeSelector ParameterType="System.String" Required="true" />
27+
<NewValue ParameterType="System.String" Required="true" />
28+
</ParameterGroup>
29+
<Task>
30+
<Reference Include="System.Core" />
31+
<Reference Include="System.Xml" />
32+
<Using Namespace="System" />
33+
<Using Namespace="System.Xml" />
34+
<Code Type="Fragment" Language="cs">
35+
<![CDATA[
36+
var xdoc = new XmlDocument();
37+
xdoc.Load(Filename);
38+
var nodes = xdoc.SelectNodes(XPathNodeSelector);
39+
if(nodes != null)
40+
{
41+
foreach (XmlNode node in nodes)
42+
{
43+
node.InnerText = NewValue;
44+
}
45+
}
46+
xdoc.Save(Filename);
47+
]]>
48+
</Code>
49+
</Task>
50+
</UsingTask>
51+
<UsingTask TaskName="AppendXmlNodeText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
52+
<ParameterGroup>
53+
<Filename ParameterType="System.String" Required="true" />
54+
<XPathNodeSelector ParameterType="System.String" Required="true" />
55+
<NewValue ParameterType="System.String" Required="true" />
56+
</ParameterGroup>
57+
<Task>
58+
<Reference Include="System.Core" />
59+
<Reference Include="System.Xml" />
60+
<Using Namespace="System" />
61+
<Using Namespace="System.Xml" />
62+
<Code Type="Fragment" Language="cs">
63+
<![CDATA[
64+
var xdoc = new XmlDocument();
65+
xdoc.Load(Filename);
66+
var nodes = xdoc.SelectNodes(XPathNodeSelector);
67+
if(nodes != null)
68+
{
69+
foreach (XmlNode node in nodes)
70+
{
71+
node.InnerText = node.InnerText + NewValue;
72+
}
73+
}
74+
xdoc.Save(Filename);
75+
]]>
76+
</Code>
77+
</Task>
78+
</UsingTask>
79+
<UsingTask TaskName="ReplaceXmlAttributeValue" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
80+
<ParameterGroup>
81+
<Filename ParameterType="System.String" Required="true" />
82+
<XPathAttributeSelector ParameterType="System.String" Required="true" />
83+
<NewValue ParameterType="System.String" Required="true" />
84+
</ParameterGroup>
85+
<Task>
86+
<Reference Include="System.Core" />
87+
<Reference Include="System.Xml" />
88+
<Using Namespace="System" />
89+
<Using Namespace="System.Xml" />
90+
<Code Type="Fragment" Language="cs">
91+
<![CDATA[
92+
var xdoc = new XmlDocument();
93+
xdoc.Load(Filename);
94+
var attributes = xdoc.SelectNodes(XPathAttributeSelector);
95+
if (attributes != null)
96+
{
97+
foreach (XmlAttribute attribute in attributes)
98+
{
99+
attribute.Value = NewValue;
100+
}
101+
}
102+
xdoc.Save(Filename);
103+
]]>
104+
</Code>
105+
</Task>
106+
</UsingTask>
107+
<UsingTask TaskName="ToShortVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
108+
<ParameterGroup>
109+
<Version ParameterType="System.String" Required="true" />
110+
<ShortVersion ParameterType="System.String" Output="true" />
111+
</ParameterGroup>
112+
<Task>
113+
<Reference Include="System.Core" />
114+
<Using Namespace="System" />
115+
<Code Type="Fragment" Language="cs">
116+
<![CDATA[
117+
ShortVersion = "";
118+
foreach (var s in Version.Split('.'))
119+
{
120+
if(!string.IsNullOrEmpty(ShortVersion)) ShortVersion += ".";
121+
ShortVersion += s.TrimStart('0');
122+
if(ShortVersion.EndsWith(".")) ShortVersion += "0";
123+
}
124+
]]>
125+
</Code>
126+
</Task>
127+
</UsingTask>
128+
129+
</Project>

‎Build/LibraryPackage.targets

+48
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,54 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
-->
2323
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2424
<Import Project="MSBuild.Community.Tasks.Targets" />
25+
<Import Project="$(BuildScriptsPath)\Helpers.Targets" />
26+
<Target Name="SetVersion" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<XmlRead Prefix="n"
28+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
29+
XPath="dotnetnuke/packages/package[1]/@version"
30+
XmlFileName="$(DNNFileName).dnn">
31+
<Output TaskParameter="Value" PropertyName="Version" />
32+
</XmlRead>
33+
34+
<ToShortVersion Version="$(Version)">
35+
<Output PropertyName="sVersion" TaskParameter="ShortVersion" />
36+
</ToShortVersion>
37+
38+
<!-- AssemblyInfo -->
39+
<ReplaceFileText
40+
Filename="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs"
41+
MatchExpression="AssemblyVersion\(&quot;[0-9|\\.]%2A&quot;\)"
42+
ReplacementText="AssemblyVersion(&quot;$(Version)&quot;)" />
43+
<ReplaceFileText
44+
Filename="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs"
45+
MatchExpression="AssemblyFileVersion\(&quot;[0-9|\\.]%2A&quot;\)"
46+
ReplacementText="AssemblyFileVersion(&quot;$(Version)&quot;)" />
47+
48+
<!-- Manifest -->
49+
<ReplaceXmlAttributeValue
50+
Filename="$(DNNFileName).dnn"
51+
XPathAttributeSelector = "/dotnetnuke/packages/package/@version"
52+
NewValue="$(Version)" />
53+
<ReplaceXmlNodeText
54+
Filename="$(DNNFileName).dnn"
55+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Assembly']/assemblies/assembly/version[../name/text() = '$(AssemblyName).dll']"
56+
NewValue="$(Version)" />
57+
<ReplaceXmlNodeText
58+
Filename="$(DNNFileName).dnn"
59+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Script']/scripts/script[@type='UnInstall']/version"
60+
NewValue="$(Version)" />
61+
62+
<!-- Symbols Manifest -->
63+
<ReplaceXmlAttributeValue
64+
Filename="$(DNNFileName)_Symbols.dnn"
65+
XPathAttributeSelector = "/dotnetnuke/packages/package/@version"
66+
NewValue="$(Version)" />
67+
<ReplaceXmlAttributeValue
68+
Filename="$(DNNFileName)_Symbols.dnn"
69+
XPathAttributeSelector = "/dotnetnuke/packages/package/dependencies/dependency[@type='managedPackage'][text()='$(PackageName)']/@version"
70+
NewValue="$(sVersion)" />
71+
72+
</Target>
2573
<Target Name="PackageModule" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2674
<XmlRead Prefix="n"
2775
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"

‎Build/ModulePackage.targets

+52
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,58 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
-->
2323
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2424
<Import Project="MSBuild.Community.Tasks.Targets" />
25+
<Import Project="$(BuildScriptsPath)\Helpers.Targets" />
26+
<Target Name="SetVersion" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<XmlRead Prefix="n"
28+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
29+
XPath="dotnetnuke/packages/package[1]/@version"
30+
XmlFileName="$(DNNFileName).dnn">
31+
<Output TaskParameter="Value" PropertyName="Version" />
32+
</XmlRead>
33+
34+
<ToShortVersion Version="$(Version)">
35+
<Output PropertyName="sVersion" TaskParameter="ShortVersion" />
36+
</ToShortVersion>
37+
38+
<!-- AssemblyInfo -->
39+
<ReplaceFileText
40+
Filename="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs"
41+
MatchExpression="AssemblyVersion\(&quot;[0-9|\\.]%2A&quot;\)"
42+
ReplacementText="AssemblyVersion(&quot;$(Version)&quot;)" />
43+
<ReplaceFileText
44+
Filename="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs"
45+
MatchExpression="AssemblyFileVersion\(&quot;[0-9|\\.]%2A&quot;\)"
46+
ReplacementText="AssemblyFileVersion(&quot;$(Version)&quot;)" />
47+
48+
<!-- Manifest -->
49+
<ReplaceXmlAttributeValue
50+
Filename="$(DNNFileName).dnn"
51+
XPathAttributeSelector = "/dotnetnuke/packages/package/@version"
52+
NewValue="$(Version)" />
53+
<ReplaceXmlNodeText
54+
Filename="$(DNNFileName).dnn"
55+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Assembly']/assemblies/assembly/version[../name/text() = '$(AssemblyName).dll']"
56+
NewValue="$(Version)" />
57+
<ReplaceXmlNodeText
58+
Filename="$(DNNFileName).dnn"
59+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Script']/scripts/script[@type='UnInstall']/version"
60+
NewValue="$(Version)" />
61+
<ReplaceXmlNodeText
62+
Filename="$(DNNFileName).dnn"
63+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Module']/eventMessage/attributes/upgradeVersionsList"
64+
NewValue="$(Version)" />
65+
66+
<!-- Symbols Manifest -->
67+
<ReplaceXmlAttributeValue
68+
Filename="$(DNNFileName)_Symbols.dnn"
69+
XPathAttributeSelector = "/dotnetnuke/packages/package/@version"
70+
NewValue="$(Version)" />
71+
<ReplaceXmlAttributeValue
72+
Filename="$(DNNFileName)_Symbols.dnn"
73+
XPathAttributeSelector = "/dotnetnuke/packages/package/dependencies/dependency[@type='managedPackage'][text()='$(PackageName)']/@version"
74+
NewValue="$(sVersion)" />
75+
76+
</Target>
2577
<Target Name="PackageModule" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2678
<XmlRead Prefix="n"
2779
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"

‎Build/SkinPackage.targets

+48
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,54 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222
-->
2323
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2424
<Import Project="MSBuild.Community.Tasks.Targets" />
25+
<Import Project="$(BuildScriptsPath)\Helpers.Targets" />
26+
<Target Name="SetVersion" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<XmlRead Prefix="n"
28+
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
29+
XPath="dotnetnuke/packages/package[1]/@version"
30+
XmlFileName="$(DNNFileName).dnn">
31+
<Output TaskParameter="Value" PropertyName="Version" />
32+
</XmlRead>
33+
34+
<ToShortVersion Version="$(Version)">
35+
<Output PropertyName="sVersion" TaskParameter="ShortVersion" />
36+
</ToShortVersion>
37+
38+
<!-- AssemblyInfo -->
39+
<ReplaceFileText
40+
Filename="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs"
41+
MatchExpression="AssemblyVersion\(&quot;[0-9|\\.]%2A&quot;\)"
42+
ReplacementText="AssemblyVersion(&quot;$(Version)&quot;)" />
43+
<ReplaceFileText
44+
Filename="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs"
45+
MatchExpression="AssemblyFileVersion\(&quot;[0-9|\\.]%2A&quot;\)"
46+
ReplacementText="AssemblyFileVersion(&quot;$(Version)&quot;)" />
47+
48+
<!-- Manifest -->
49+
<ReplaceXmlAttributeValue
50+
Filename="$(DNNFileName).dnn"
51+
XPathAttributeSelector = "/dotnetnuke/packages/package/@version"
52+
NewValue="$(Version)" />
53+
<ReplaceXmlNodeText
54+
Filename="$(DNNFileName).dnn"
55+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Assembly']/assemblies/assembly/version[../name/text() = '$(AssemblyName).dll']"
56+
NewValue="$(Version)" />
57+
<ReplaceXmlNodeText
58+
Filename="$(DNNFileName).dnn"
59+
XPathNodeSelector = "/dotnetnuke/packages/package[@name='$(PackageName)']/components/component[@type='Script']/scripts/script[@type='UnInstall']/version"
60+
NewValue="$(Version)" />
61+
62+
<!-- Symbols Manifest -->
63+
<ReplaceXmlAttributeValue
64+
Filename="$(DNNFileName)_Symbols.dnn"
65+
XPathAttributeSelector = "/dotnetnuke/packages/package/@version"
66+
NewValue="$(Version)" />
67+
<ReplaceXmlAttributeValue
68+
Filename="$(DNNFileName)_Symbols.dnn"
69+
XPathAttributeSelector = "/dotnetnuke/packages/package/dependencies/dependency[@type='managedPackage'][text()='$(PackageName)']/@version"
70+
NewValue="$(sVersion)" />
71+
72+
</Target>
2573
<Target Name="PackageSkin" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2674
<XmlRead Prefix="n"
2775
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"

‎Modules/UserManager/App_LocalResources/AddEdit.resx

+3
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@
177177
<data name="PasswordMatch.Text" xml:space="preserve">
178178
<value>Password and Confirmation Password must match.</value>
179179
</data>
180+
<data name="PasswordResetLink.Text" xml:space="preserve">
181+
<value>Password Reset Link</value>
182+
</data>
180183
<data name="Save.Text" xml:space="preserve">
181184
<value>Save</value>
182185
</data>

0 commit comments

Comments
 (0)