Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 5fcad21

Browse files
committed
Update SqlMapper proj to .NET v4.5
1 parent c4a6ab0 commit 5fcad21

File tree

6 files changed

+44
-37
lines changed

6 files changed

+44
-37
lines changed

src/dapper-dot-net/EntityFramework/Model.Designer.cs

Lines changed: 24 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dapper-dot-net/EntityFramework/Model.edmx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<edmx:Edmx Version="2.0" xmlns:edmx="http://schemas.microsoft.com/ado/2008/10/edmx">
2+
<edmx:Edmx Version="3.0" xmlns:edmx="http://schemas.microsoft.com/ado/2009/11/edmx">
33
<!-- EF Runtime content -->
44
<edmx:Runtime>
55
<!-- SSDL content -->
66
<edmx:StorageModels>
7-
<Schema Namespace="tempdbModel.Store" Alias="Self" Provider="System.Data.SqlClient" ProviderManifestToken="2008" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns="http://schemas.microsoft.com/ado/2009/02/edm/ssdl">
7+
<Schema Namespace="tempdbModel.Store" Alias="Self" Provider="System.Data.SqlClient" ProviderManifestToken="2008" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
88
<EntityContainer Name="tempdbModelStoreContainer">
9-
<EntitySet Name="Posts" EntityType="tempdbModel.Store.Posts" store:Type="Tables" Schema="dbo" />
9+
<EntitySet Name="Posts" EntityType="tempdbModel.Store.Posts" store:Type="Tables" Schema="dbo" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" />
1010
</EntityContainer>
1111
<EntityType Name="Posts">
1212
<Key>
@@ -29,15 +29,15 @@
2929
</Schema></edmx:StorageModels>
3030
<!-- CSDL content -->
3131
<edmx:ConceptualModels>
32-
<Schema Namespace="tempdbModel" Alias="Self" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns="http://schemas.microsoft.com/ado/2008/09/edm">
33-
<EntityContainer Name="tempdbEntities1" annotation:LazyLoadingEnabled="true">
32+
<Schema Namespace="tempdbModel" Alias="Self" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
33+
<EntityContainer Name="tempdbEntities1" annotation:LazyLoadingEnabled="true" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation">
3434
<EntitySet Name="Posts" EntityType="tempdbModel.Post" />
3535
</EntityContainer>
3636
<EntityType Name="Post">
3737
<Key>
3838
<PropertyRef Name="Id" />
3939
</Key>
40-
<Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
40+
<Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
4141
<Property Name="Text" Type="String" Nullable="false" MaxLength="Max" Unicode="false" FixedLength="false" />
4242
<Property Name="CreationDate" Type="DateTime" Nullable="false" />
4343
<Property Name="LastChangeDate" Type="DateTime" Nullable="false" />
@@ -55,7 +55,7 @@
5555
</edmx:ConceptualModels>
5656
<!-- C-S mapping content -->
5757
<edmx:Mappings>
58-
<Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2008/09/mapping/cs">
58+
<Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
5959
<EntityContainerMapping StorageEntityContainer="tempdbModelStoreContainer" CdmEntityContainer="tempdbEntities1">
6060
<EntitySetMapping Name="Posts"><EntityTypeMapping TypeName="tempdbModel.Post"><MappingFragment StoreEntitySet="Posts">
6161
<ScalarProperty Name="Id" ColumnName="Id" />
@@ -77,7 +77,7 @@
7777
</edmx:Mappings>
7878
</edmx:Runtime>
7979
<!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
80-
<Designer xmlns="http://schemas.microsoft.com/ado/2008/10/edmx">
80+
<Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
8181
<Connection>
8282
<DesignerInfoPropertySet>
8383
<DesignerProperty Name="MetadataArtifactProcessing" Value="EmbedInOutputAssembly" />

src/dapper-dot-net/Linq2Sql/DataClasses.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.

src/dapper-dot-net/Properties/Settings.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dapper-dot-net/SqlMapper.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<RootNamespace>SqlMapper</RootNamespace>
1212
<AssemblyName>Smackdown</AssemblyName>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
15+
<TargetFrameworkProfile />
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1618
<PlatformTarget>x86</PlatformTarget>
@@ -21,6 +23,7 @@
2123
<DefineConstants>DEBUG;TRACE</DefineConstants>
2224
<ErrorReport>prompt</ErrorReport>
2325
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2427
</PropertyGroup>
2528
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2629
<PlatformTarget>x86</PlatformTarget>
@@ -30,6 +33,7 @@
3033
<DefineConstants>TRACE</DefineConstants>
3134
<ErrorReport>prompt</ErrorReport>
3235
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
3337
</PropertyGroup>
3438
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Signed|x86'">
3539
<OutputPath>bin\x86\Signed\</OutputPath>
@@ -39,6 +43,7 @@
3943
<PlatformTarget>x86</PlatformTarget>
4044
<ErrorReport>prompt</ErrorReport>
4145
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
46+
<Prefer32Bit>false</Prefer32Bit>
4247
</PropertyGroup>
4348
<ItemGroup>
4449
<Reference Include="ServiceStack.Interfaces">

src/dapper-dot-net/app.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0"?>
22
<configuration>
33
<configSections></configSections>
44
<connectionStrings>
5-
<add name="Smackdown.Properties.Settings.tempdbConnectionString" connectionString="Data Source=.;Initial Catalog=tempdb;Integrated Security=True" providerName="System.Data.SqlClient" /><add name="tempdbEntities" connectionString="metadata=res://*/EntityFramework.Model.csdl|res://*/EntityFramework.Model.ssdl|res://*/EntityFramework.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=tempdb;integrated security=True;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /><add name="tempdbEntities1" connectionString="metadata=res://*/EntityFramework.Model.csdl|res://*/EntityFramework.Model.ssdl|res://*/EntityFramework.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=tempdb;integrated security=True;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /></connectionStrings>
5+
<add name="Smackdown.Properties.Settings.tempdbConnectionString" connectionString="Data Source=.;Initial Catalog=tempdb;Integrated Security=True" providerName="System.Data.SqlClient"/><add name="tempdbEntities" connectionString="metadata=res://*/EntityFramework.Model.csdl|res://*/EntityFramework.Model.ssdl|res://*/EntityFramework.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=tempdb;integrated security=True;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/><add name="tempdbEntities1" connectionString="metadata=res://*/EntityFramework.Model.csdl|res://*/EntityFramework.Model.ssdl|res://*/EntityFramework.Model.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=.;initial catalog=tempdb;integrated security=True;multipleactiveresultsets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient"/></connectionStrings>
66
<startup>
7-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
7+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
88
</startup>
9-
</configuration>
9+
</configuration>

0 commit comments

Comments
 (0)