Skip to content

Commit

Permalink
Merge pull request #12 from frederiksen/msix
Browse files Browse the repository at this point in the history 
Merge the msix branch into master
  • Loading branch information
@frederiksen
frederiksen authored May 12, 2020
2 parents 95af9eb + c5b807a commit b444aad
Show file tree
Hide file tree
Showing 98 changed files with 549 additions and 1,110 deletions.
24 changes: 0 additions & 24 deletions src/NonMicrosoftServices/DemoServices/Demo.cs
View file

This file was deleted.

44 changes: 0 additions & 44 deletions src/NonMicrosoftServices/DemoServices/DemoProject.cs
View file

This file was deleted.

86 changes: 0 additions & 86 deletions src/NonMicrosoftServices/DemoServices/DemoServices.csproj
View file

This file was deleted.

12 changes: 0 additions & 12 deletions src/NonMicrosoftServices/DemoServices/DemoUserControl.xaml
View file

This file was deleted.

28 changes: 0 additions & 28 deletions src/NonMicrosoftServices/DemoServices/DemoUserControl.xaml.cs
View file

This file was deleted.

36 changes: 0 additions & 36 deletions src/NonMicrosoftServices/DemoServices/Properties/AssemblyInfo.cs
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/NonMicrosoftServices/JIRAServices/JIRAServices.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>JIRAServices</RootNamespace>
<AssemblyName>JIRAServices</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -102,7 +102,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /r /y "$(TargetDir)*.dll" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\JIRAServices\"</PostBuildEvent>
<PostBuildEvent>xcopy /r /y "$(TargetDir)*.dll" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion src/NonMicrosoftServices/JIRAServices/Properties/Settings.Designer.cs
View file

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

2 changes: 1 addition & 1 deletion src/ReportInterface/ReportInterface.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReportInterface</RootNamespace>
<AssemblyName>ReportInterface</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down
2 changes: 1 addition & 1 deletion src/ReportingFramework/ReportingFramework.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReportingFramework</RootNamespace>
<AssemblyName>ReportingFramework</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down
6 changes: 3 additions & 3 deletions src/Reports/Generic/Generic.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Generic</RootNamespace>
<AssemblyName>Generic</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AssemblyName>Generic_report</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -80,7 +80,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\Generic\"</PostBuildEvent>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
6 changes: 3 additions & 3 deletions src/Reports/JiraScrumBasic/JiraScrumBasic.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>JiraScrumBasic</RootNamespace>
<AssemblyName>JiraScrumBasic</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AssemblyName>JiraScrumBasic_report</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -83,7 +83,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\JiraScrumBasic\"</PostBuildEvent>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
6 changes: 3 additions & 3 deletions src/Reports/JiraScrumCompact/JiraScrumCompact.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>JiraScrumCompact</RootNamespace>
<AssemblyName>JiraScrumCompact</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AssemblyName>JiraScrumCompact_report</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -84,7 +84,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\JiraScrumCompact\"</PostBuildEvent>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
6 changes: 3 additions & 3 deletions src/Reports/JiraScrumDescription/JiraScrumDescription.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>JiraScrumDescription</RootNamespace>
<AssemblyName>JiraScrumDescription</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AssemblyName>JiraScrumDescription_report</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -84,7 +84,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\JiraScrumDescription\"</PostBuildEvent>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
6 changes: 3 additions & 3 deletions src/Reports/JiraScrumDetailed/JiraScrumDetailed.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>JiraScrumDetailed</RootNamespace>
<AssemblyName>JiraScrumDetailed</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<AssemblyName>JiraScrumDetailed_report</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -93,7 +93,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.WinFX.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\jiraScrumDetailed\"</PostBuildEvent>
<PostBuildEvent>xcopy /r /y "$(TargetPath)" "$(SolutionDir)\TaskCardCreator\bin\$(ConfigurationName)\"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Loading

0 comments on commit b444aad

Please sign in to comment.