Skip to content

Commit cb04db2

Browse files
amccoolamccool
authored
upgrade to net framework 48, change wix install (#21)
* upgrade to net framework 48, change wix install * touch * manual nuget restore * ooops * correct the artifacts * artifact paths
1 parent 15279b9 commit cb04db2

File tree

13 files changed

+156
-72
lines changed

13 files changed

+156
-72
lines changed

‎.github/workflows/dotnet-desktop.yml‎

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,19 @@ jobs:
8484
# run: dotnet test
8585

8686
# Restore the application to populate the obj folder with RuntimeIdentifiers
87-
- name: Restore the application
88-
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
89-
env:
90-
Configuration: ${{ matrix.configuration }}
87+
# - name: Restore the application
88+
# run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
89+
# env:
90+
# Configuration: ${{ matrix.configuration }}
91+
92+
- name: nuget setup
93+
uses: nuget/setup-nuget@v2
94+
with:
95+
nuget-version: '6.x'
96+
97+
- name: nuget restore
98+
run: nuget restore $env:Solution_Name
99+
91100

92101
# Decode the base 64 encoded pfx and save the Signing_Certificate
93102
# - name: Decode the pfx
@@ -97,13 +106,13 @@ jobs:
97106
# [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
98107

99108
# Create the app package by building and packaging the Windows Application Packaging project
100-
- name: Create the app package
101-
run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
102-
env:
103-
Appx_Bundle: Always
104-
Appx_Bundle_Platforms: x86|x64
105-
Appx_Package_Build_Mode: StoreUpload
106-
Configuration: ${{ matrix.configuration }}
109+
# - name: Create the app package
110+
# run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
111+
# env:
112+
# Appx_Bundle: Always
113+
# Appx_Bundle_Platforms: x86|x64
114+
# Appx_Package_Build_Mode: StoreUpload
115+
# Configuration: ${{ matrix.configuration }}
107116

108117
- name: build
109118
run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration
@@ -122,7 +131,9 @@ jobs:
122131
# path: ${{ env.Wap_Project_Directory }}\AppPackages
123132

124133
- name: Upload build artifacts
125-
uses: actions/upload-artifact@v3
134+
uses: actions/upload-artifact@v4
126135
with:
127-
name: MSIX Package
128-
path: .
136+
name: stuff
137+
path: |
138+
**/SDSetup.msi
139+
**/Win/bin/${{ matrix.configuration }}/

‎SDSetup/Product.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<Directory Name="SourceDir" Id="TARGETDIR">
1515
<Directory Name="ProgramFilesFolder" Id="ProgramFilesFolder">
16-
<Directory Name="Static Data Script Generator" Id="APPLICATIONFOLDER"/>
16+
<Directory Name="Static Data Script Generator" Id="INSTALLFOLDER"/>
1717
</Directory>
1818
</Directory>
1919

@@ -37,7 +37,7 @@
3737
</Component>-->
3838

3939
<Feature Id="AllFeatures" Title="All Features" Level="1">
40-
<ComponentGroupRef Id="Binaries"/>
40+
<ComponentGroupRef Id="cmp_INSTALLFOLDER"/>
4141
</Feature>
4242

4343
</Product>

‎SDSetup/SDSetup.Binaries.wxs‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3+
<Fragment>
4+
<DirectoryRef Id="APPLICATIONFOLDER">
5+
<Directory Id="dir3EA83D422F7CBEF2F27940356DEA00B9" Name="Debug">
6+
<Component Id="cmpE2C13EF5DCCB582D5BA5738AEDBA007D" Guid="*">
7+
<File Id="fil74DDEF1847E91488033A1C826F053C19" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\DefaultTemplate.sql" />
8+
</Component>
9+
<Component Id="cmpA6F47B6AB656E3CDDC72CEACF9FFFE73" Guid="*">
10+
<File Id="fil62930B32247048FBDAB011C2E5CF3F87" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Microsoft.Data.ConnectionUI.Dialog.dll" />
11+
</Component>
12+
<Component Id="cmp08A599F537C9B42E7A57B633371807AD" Guid="*">
13+
<File Id="fil34C0D24520E552FA11F67E5B3B4C7E9C" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Microsoft.Data.ConnectionUI.dll" />
14+
</Component>
15+
<Component Id="cmp44E3C853A640B32490A80667A97C5E1D" Guid="*">
16+
<File Id="fil23D7CE083418B666C0CB3704EC205F34" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Static Data Script Generator.exe" />
17+
</Component>
18+
<Component Id="cmp402581BB4E505DC02ADD144314113554" Guid="*">
19+
<File Id="filE361E33B0B75937C0AC1529D2207F8E8" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Static Data Script Generator.exe.config" />
20+
</Component>
21+
<Component Id="cmp7F505D14AE1DF17327A17562DB88E646" Guid="*">
22+
<File Id="fil223BF76E6009DA43FCB91680D34C919F" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Static Data Script Generator.pdb" />
23+
</Component>
24+
<Component Id="cmp7D2C1543D9CD7F0762293898BD6B539C" Guid="*">
25+
<File Id="fil997036E070F87588870E5B084105E712" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\StaticGeneratorCommon.dll" />
26+
</Component>
27+
<Component Id="cmp6CDB32C278DDAEE2F45E21861BB883B8" Guid="*">
28+
<File Id="fil7D5BA58427271BFC2AE1F091AF1A79B9" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\StaticGeneratorCommon.pdb" />
29+
</Component>
30+
</Directory>
31+
</DirectoryRef>
32+
</Fragment>
33+
<Fragment>
34+
<ComponentGroup Id="Binaries">
35+
<ComponentRef Id="cmpE2C13EF5DCCB582D5BA5738AEDBA007D" />
36+
<ComponentRef Id="cmpA6F47B6AB656E3CDDC72CEACF9FFFE73" />
37+
<ComponentRef Id="cmp08A599F537C9B42E7A57B633371807AD" />
38+
<ComponentRef Id="cmp44E3C853A640B32490A80667A97C5E1D" />
39+
<ComponentRef Id="cmp402581BB4E505DC02ADD144314113554" />
40+
<ComponentRef Id="cmp7F505D14AE1DF17327A17562DB88E646" />
41+
<ComponentRef Id="cmp7D2C1543D9CD7F0762293898BD6B539C" />
42+
<ComponentRef Id="cmp6CDB32C278DDAEE2F45E21861BB883B8" />
43+
</ComponentGroup>
44+
</Fragment>
45+
</Wix>

‎SDSetup/SDSetup.wixproj‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\wix.3.14.1\build\wix.props" Condition="Exists('..\packages\wix.3.14.1\build\wix.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,6 +11,8 @@
1011
<OutputType>Package</OutputType>
1112
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1213
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
14+
<NuGetPackageImportStamp>
15+
</NuGetPackageImportStamp>
1316
</PropertyGroup>
1417
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1518
<OutputPath>bin\$(Configuration)\</OutputPath>
@@ -35,10 +38,34 @@
3538
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
3639
</ProjectReference>
3740
</ItemGroup>
41+
<ItemGroup>
42+
<Content Include="packages.config" />
43+
</ItemGroup>
3844
<Import Project="$(WixTargetsPath)" />
39-
<PropertyGroup>
40-
<PreBuildEvent />
41-
</PropertyGroup>
45+
46+
<Target Name="BeforeBuild">
47+
<!-- <Exec Command="dotnet publish ..\REWebApp\REWebApp.csproj -c $(Configuration) /property:PublishWithAspNetCoreTargetManifest=false" /> -->
48+
<PropertyGroup>
49+
<LinkerBaseInputPaths>..\Win\bin\$(Configuration)</LinkerBaseInputPaths>
50+
<DefineConstants>BasePath=..\Win\bin\$(Configuration)</DefineConstants>
51+
</PropertyGroup>
52+
<HeatDirectory OutputFile="StaticGenerator.Binaries.wxs" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="cmp_INSTALLFOLDER" SuppressCom="true" Directory="..\Win\bin\$(Configuration)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BasePath" RunAsSeparateProcess="$(RunWixToolsOutOfProc)" />
53+
<!-- <HeatDirectory OutputFile="FileSetup.wxs" DirectoryRefId="INSTALLFOLDER" ComponentGroupName="REIdentity_Project" SuppressCom="true" Directory="..\REIdentityHost\bin\$(Configuration)\netcoreapp2.2\publish" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" AutoGenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" PreprocessorVariable="var.BasePath" /> -->
54+
55+
<!-- REM ..\packages\wix.3.14.1\tools\heat.exe dir ..\Win\bin\$(ConfigurationName) -var var.StaticGenerator.TargetDir -dr APPLICATIONFOLDER -cg Binaries -ag -scom -sreg -sfrag –srd -o $(ProjectName).Binaries.wxs -->
56+
57+
</Target>
58+
59+
60+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
61+
<PropertyGroup>
62+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
63+
</PropertyGroup>
64+
<Error Condition="!Exists('..\packages\wix.3.14.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wix.3.14.1\build\wix.props'))" />
65+
</Target>
66+
<!-- <PropertyGroup>
67+
<PreBuildEvent>..\packages\wix.3.14.1\tools\heat.exe dir ..\Win\bin\$(ConfigurationName) -var var.StaticGenerator.TargetDir -dr APPLICATIONFOLDER -cg Binaries -ag -scom -sreg -sfrag –srd -o $(ProjectName).Binaries.wxs</PreBuildEvent>
68+
</PropertyGroup> -->
4269
<!--
4370
To modify your build process, add your task inside one of the targets below and uncomment it.
4471
Other similar extension points exist, see Wix.targets.

‎SDSetup/StaticGenerator.Binaries.wxs‎

Lines changed: 34 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,43 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<Fragment>
4-
<DirectoryRef Id="APPLICATIONFOLDER">
5-
<Directory Id="dir3EA83D422F7CBEF2F27940356DEA00B9" Name="Debug">
6-
<Component Id="cmpE2C13EF5DCCB582D5BA5738AEDBA007D" Guid="*">
7-
<File Id="fil74DDEF1847E91488033A1C826F053C19" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\DefaultTemplate.sql" />
8-
</Component>
9-
<Component Id="cmpA6F47B6AB656E3CDDC72CEACF9FFFE73" Guid="*">
10-
<File Id="fil62930B32247048FBDAB011C2E5CF3F87" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Microsoft.Data.ConnectionUI.Dialog.dll" />
11-
</Component>
12-
<Component Id="cmp08A599F537C9B42E7A57B633371807AD" Guid="*">
13-
<File Id="fil34C0D24520E552FA11F67E5B3B4C7E9C" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Microsoft.Data.ConnectionUI.dll" />
14-
</Component>
15-
<Component Id="cmp44E3C853A640B32490A80667A97C5E1D" Guid="*">
16-
<File Id="fil23D7CE083418B666C0CB3704EC205F34" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Static Data Script Generator.exe" />
17-
</Component>
18-
<Component Id="cmp402581BB4E505DC02ADD144314113554" Guid="*">
19-
<File Id="filE361E33B0B75937C0AC1529D2207F8E8" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Static Data Script Generator.exe.config" />
20-
</Component>
21-
<Component Id="cmp7F505D14AE1DF17327A17562DB88E646" Guid="*">
22-
<File Id="fil223BF76E6009DA43FCB91680D34C919F" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Static Data Script Generator.pdb" />
23-
</Component>
24-
<Component Id="cmp9BE3443FEAB75BD7FC19430EB26B2689" Guid="*">
25-
<File Id="filBEB957871E623C9E98C40E9C60C77196" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Static Data Script Generator.vshost.exe" />
26-
</Component>
27-
<Component Id="cmp84990E56BDCC5720BB2D3AE45AC155DA" Guid="*">
28-
<File Id="fil4CFED195558343C393CFB61EF2507E83" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\Static Data Script Generator.vshost.exe.config" />
29-
</Component>
30-
<Component Id="cmp7D2C1543D9CD7F0762293898BD6B539C" Guid="*">
31-
<File Id="fil997036E070F87588870E5B084105E712" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\StaticGeneratorCommon.dll" />
32-
</Component>
33-
<Component Id="cmp6CDB32C278DDAEE2F45E21861BB883B8" Guid="*">
34-
<File Id="fil7D5BA58427271BFC2AE1F091AF1A79B9" KeyPath="yes" Source="$(var.StaticGenerator.TargetDir)\StaticGeneratorCommon.pdb" />
35-
</Component>
36-
</Directory>
4+
<DirectoryRef Id="INSTALLFOLDER">
5+
<Component Id="cmp1D946EA74B2E5D0E63840DF89C59EAE1" Guid="{20E3398C-6668-43F4-8C91-1304DE5E9D1E}">
6+
<File Id="fil0B35192EC2221A75F7D5BB84F8AE5339" KeyPath="yes" Source="$(var.BasePath)\DefaultTemplate.sql" />
7+
</Component>
8+
<Component Id="cmpEC01AF6B8D5EF8A05804D3A5F37944D6" Guid="{A838AC23-5971-4299-9446-F76CEC80A812}">
9+
<File Id="fil20DC857D6CED75D4350C99240E49B652" KeyPath="yes" Source="$(var.BasePath)\Microsoft.Data.ConnectionUI.Dialog.dll" />
10+
</Component>
11+
<Component Id="cmp19C95D2CAC7F2E9CC50214C3520486AF" Guid="{33FA3CEA-AB28-4A08-B104-8CE65382D3E8}">
12+
<File Id="filFDEA74E52032BF1EB6936EA12C942E38" KeyPath="yes" Source="$(var.BasePath)\Microsoft.Data.ConnectionUI.dll" />
13+
</Component>
14+
<Component Id="cmpAC33A12E307CAEF9F2B14852E7D12BC0" Guid="{2AC0583E-741A-4523-8828-BC98081E877D}">
15+
<File Id="fil4DD3815AE4446001D614F1BA78F63C3E" KeyPath="yes" Source="$(var.BasePath)\Static Data Script Generator.exe" />
16+
</Component>
17+
<Component Id="cmpD2AEE67DA8242957FE1AEEA005676F58" Guid="{EC7BCF51-8E42-4242-8DCD-9241B925BA04}">
18+
<File Id="fil2FC0E7E7A2DA574284860057EBCD006B" KeyPath="yes" Source="$(var.BasePath)\Static Data Script Generator.exe.config" />
19+
</Component>
20+
<Component Id="cmp9466C8460D8E7244E250CB52CBA31FBF" Guid="{814ED1F2-F0A5-47EA-B395-50E688112717}">
21+
<File Id="filF50F17721A1A916315E9791BBD8E2E97" KeyPath="yes" Source="$(var.BasePath)\Static Data Script Generator.pdb" />
22+
</Component>
23+
<Component Id="cmpBC4E046E56032A80CA9312F07ED4E23A" Guid="{2FC9D63F-A65D-47B2-BC1D-8713599B4402}">
24+
<File Id="filA43958CC89AD68751040134A46715A7B" KeyPath="yes" Source="$(var.BasePath)\StaticGeneratorCommon.dll" />
25+
</Component>
26+
<Component Id="cmpCB4CF12AE13B498164BD6122A185419F" Guid="{4799EFF8-F605-4364-B904-43900CCD9AA8}">
27+
<File Id="fil91849FBCF8F2DA9C500C7AE16D2836E8" KeyPath="yes" Source="$(var.BasePath)\StaticGeneratorCommon.pdb" />
28+
</Component>
3729
</DirectoryRef>
3830
</Fragment>
3931
<Fragment>
40-
<ComponentGroup Id="Binaries">
41-
<ComponentRef Id="cmpE2C13EF5DCCB582D5BA5738AEDBA007D" />
42-
<ComponentRef Id="cmpA6F47B6AB656E3CDDC72CEACF9FFFE73" />
43-
<ComponentRef Id="cmp08A599F537C9B42E7A57B633371807AD" />
44-
<ComponentRef Id="cmp44E3C853A640B32490A80667A97C5E1D" />
45-
<ComponentRef Id="cmp402581BB4E505DC02ADD144314113554" />
46-
<ComponentRef Id="cmp7F505D14AE1DF17327A17562DB88E646" />
47-
<ComponentRef Id="cmp9BE3443FEAB75BD7FC19430EB26B2689" />
48-
<ComponentRef Id="cmp84990E56BDCC5720BB2D3AE45AC155DA" />
49-
<ComponentRef Id="cmp7D2C1543D9CD7F0762293898BD6B539C" />
50-
<ComponentRef Id="cmp6CDB32C278DDAEE2F45E21861BB883B8" />
32+
<ComponentGroup Id="cmp_INSTALLFOLDER">
33+
<ComponentRef Id="cmp1D946EA74B2E5D0E63840DF89C59EAE1" />
34+
<ComponentRef Id="cmpEC01AF6B8D5EF8A05804D3A5F37944D6" />
35+
<ComponentRef Id="cmp19C95D2CAC7F2E9CC50214C3520486AF" />
36+
<ComponentRef Id="cmpAC33A12E307CAEF9F2B14852E7D12BC0" />
37+
<ComponentRef Id="cmpD2AEE67DA8242957FE1AEEA005676F58" />
38+
<ComponentRef Id="cmp9466C8460D8E7244E250CB52CBA31FBF" />
39+
<ComponentRef Id="cmpBC4E046E56032A80CA9312F07ED4E23A" />
40+
<ComponentRef Id="cmpCB4CF12AE13B498164BD6122A185419F" />
5141
</ComponentGroup>
5242
</Fragment>
5343
</Wix>

‎SDSetup/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="wix" version="3.14.1" />
4+
</packages>

‎StaticGenerator.sln‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.10.35122.118
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StaticGenerator", "Win\StaticGenerator.csproj", "{4159A0A2-2727-49B0-BD93-97F526EABE68}"
77
EndProject
@@ -38,10 +38,14 @@ Global
3838
{36E1FBD3-5003-4B47-9AE3-5E39809EFB65}.Debug|x86.ActiveCfg = Debug|x86
3939
{36E1FBD3-5003-4B47-9AE3-5E39809EFB65}.Debug|x86.Build.0 = Debug|x86
4040
{36E1FBD3-5003-4B47-9AE3-5E39809EFB65}.Release|Any CPU.ActiveCfg = Release|x86
41+
{36E1FBD3-5003-4B47-9AE3-5E39809EFB65}.Release|Any CPU.Build.0 = Release|x86
4142
{36E1FBD3-5003-4B47-9AE3-5E39809EFB65}.Release|x86.ActiveCfg = Release|x86
4243
{36E1FBD3-5003-4B47-9AE3-5E39809EFB65}.Release|x86.Build.0 = Release|x86
4344
EndGlobalSection
4445
GlobalSection(SolutionProperties) = preSolution
4546
HideSolutionNode = FALSE
4647
EndGlobalSection
48+
GlobalSection(ExtensibilityGlobals) = postSolution
49+
SolutionGuid = {38667246-E350-4304-9308-AF8C9AEA3169}
50+
EndGlobalSection
4751
EndGlobal

‎Win/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
</setting>
1919
</StaticGenerator.Properties.Settings>
2020
</userSettings>
21-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
21+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

‎Win/DatabaseConnection/DataConnectionConfiguration.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
using System.Xml.Linq;
1111
using System.IO;
1212
using System.Xml;
13+
using Microsoft.Data.ConnectionUI;
1314

14-
namespace Microsoft.Data.ConnectionUI
15+
namespace SSDTThing
1516
{
1617
/// <summary>
1718
/// Provide a default implementation for the storage of DataConnection Dialog UI configuration.

‎Win/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)