Skip to content

Commit 2d269d4

Browse files
committed
Merge remote-tracking branch 'refs/remotes/Microsoft/master'
2 parents 1189a89 + 89d00e3 commit 2d269d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2010
-13
lines changed
100 KB
Loading
71.7 KB
Loading
85.6 KB
Loading
29.5 KB
Loading
37.1 KB
Loading
82.6 KB
Loading

samples/databases/wide-world-importers/wwi-dw-ssdt/wwi-dw-ssdt/WideWorldImportersDW.sqlproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
<Folder Include="Security\" />
8181
<Folder Include="Sequences\Sequences\" />
8282
<Folder Include="PostDeploymentScripts" />
83+
<Folder Include="dbo" />
84+
<Folder Include="dbo\Tables" />
8385
</ItemGroup>
8486
<ItemGroup>
8587
<Build Include="Integration\Tables\ETL Cutoff.sql" />
@@ -153,7 +155,7 @@
153155
<Build Include="Sequences\Sequences\StockItemKey.sql" />
154156
<Build Include="Sequences\Sequences\SupplierKey.sql" />
155157
<Build Include="Sequences\Sequences\TransactionTypeKey.sql" />
156-
<Build Include="SampleVersion.sql" />
158+
<Build Include="dbo\Tables\SampleVersion.sql" />
157159
</ItemGroup>
158160
<ItemGroup>
159161
<PostDeploy Include="PostDeploymentScripts\Script.PostDeployment1.sql" />
File renamed without changes.

samples/databases/wide-world-importers/wwi-sample.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "WideWorldImportersDW", "wwi-dw-ssdt\wwi-dw-ssdt\WideWorldImportersDW.sqlproj", "{79C14C29-3A96-4B59-BC92-0290AF92F05B}"
77
EndProject
8-
Project("{D2ABAB84-BF74-430A-B69E-9DC6D40DDA17}") = "WWI-SSASMD", "wwi-ssasmd\WWI-SSASMD\WWI-SSASMD.dwproj", "{AE481845-1E4D-4C1C-80DB-184CE847150F}"
8+
Project("{D2ABAB84-BF74-430A-B69E-9DC6D40DDA17}") = "WideWorldImportersMultidimensionalCube", "wwi-ssasmd\WWI-SSASMD\WideWorldImportersMultidimensionalCube.dwproj", "{AE481845-1E4D-4C1C-80DB-184CE847150F}"
99
EndProject
1010
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "WideWorldImporters", "wwi-ssdt\wwi-ssdt\WideWorldImporters.sqlproj", "{9E972C93-0716-4442-97FC-72C52C2C5AAA}"
1111
EndProject

samples/databases/wide-world-importers/wwi-ssasmd/wwi-ssasmd.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{D2ABAB84-BF74-430A-B69E-9DC6D40DDA17}") = "WWI-SSASMD", "WWI-SSASMD\WWI-SSASMD.dwproj", "{DED1F3FA-6D6A-4958-A0AC-97F8DA3B73B4}"
6+
Project("{D2ABAB84-BF74-430A-B69E-9DC6D40DDA17}") = "WideWorldImportersMultidimensionalCube", "wwi-ssasmd\WideWorldImportersMultidimensionalCube.dwproj", "{9A7C1971-1B25-4F3A-B4E3-844B34A1238A}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Development|Default = Development|Default
1111
EndGlobalSection
1212
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{DED1F3FA-6D6A-4958-A0AC-97F8DA3B73B4}.Development|Default.ActiveCfg = Development
14-
{DED1F3FA-6D6A-4958-A0AC-97F8DA3B73B4}.Development|Default.Build.0 = Development
15-
{DED1F3FA-6D6A-4958-A0AC-97F8DA3B73B4}.Development|Default.Deploy.0 = Development
13+
{9A7C1971-1B25-4F3A-B4E3-844B34A1238A}.Development|Default.ActiveCfg = Development
14+
{9A7C1971-1B25-4F3A-B4E3-844B34A1238A}.Development|Default.Build.0 = Development
15+
{9A7C1971-1B25-4F3A-B4E3-844B34A1238A}.Development|Default.Deploy.0 = Development
1616
EndGlobalSection
1717
GlobalSection(SolutionProperties) = preSolution
1818
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)